Commit 5a3c558a authored by Linus Torvalds's avatar Linus Torvalds

Merge tag '5.9-rc4-smb3-fix' of git://git.samba.org/sfrench/cifs-2.6

Pull cifs fix from Steve French:
 "A fix for lookup on DFS link when cifsacl or modefromsid is used"

* tag '5.9-rc4-smb3-fix' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: fix DFS mount with cifsacl/modefromsid
parents 729e3d09 01ec372c
...@@ -1017,6 +1017,8 @@ cifs_get_inode_info(struct inode **inode, ...@@ -1017,6 +1017,8 @@ cifs_get_inode_info(struct inode **inode,
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MODE_FROM_SID) { if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MODE_FROM_SID) {
rc = cifs_acl_to_fattr(cifs_sb, &fattr, *inode, true, rc = cifs_acl_to_fattr(cifs_sb, &fattr, *inode, true,
full_path, fid); full_path, fid);
if (rc == -EREMOTE)
rc = 0;
if (rc) { if (rc) {
cifs_dbg(FYI, "%s: Get mode from SID failed. rc=%d\n", cifs_dbg(FYI, "%s: Get mode from SID failed. rc=%d\n",
__func__, rc); __func__, rc);
...@@ -1025,6 +1027,8 @@ cifs_get_inode_info(struct inode **inode, ...@@ -1025,6 +1027,8 @@ cifs_get_inode_info(struct inode **inode,
} else if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) { } else if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) {
rc = cifs_acl_to_fattr(cifs_sb, &fattr, *inode, false, rc = cifs_acl_to_fattr(cifs_sb, &fattr, *inode, false,
full_path, fid); full_path, fid);
if (rc == -EREMOTE)
rc = 0;
if (rc) { if (rc) {
cifs_dbg(FYI, "%s: Getting ACL failed with error: %d\n", cifs_dbg(FYI, "%s: Getting ACL failed with error: %d\n",
__func__, rc); __func__, rc);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment