summaryrefslogtreecommitdiffstats
path: root/fs/cifs
diff options
context:
space:
mode:
authorRonnie Sahlberg <lsahlber@redhat.com>2018-08-10 11:03:55 +1000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-05 09:29:40 +0200
commita673044fbe8b16c27fedb595959167e1ac9bda71 (patch)
treec69e0a02bc6eff02d7d9c4b78c5e6159b07d1083 /fs/cifs
parent08aee5c2c26f5f8a17446da9a137ac8400a0e692 (diff)
downloadlinux-stable-a673044fbe8b16c27fedb595959167e1ac9bda71.tar.gz
linux-stable-a673044fbe8b16c27fedb595959167e1ac9bda71.tar.bz2
linux-stable-a673044fbe8b16c27fedb595959167e1ac9bda71.zip
cifs: add missing support for ACLs in SMB 3.11
commit c1777df1a5d541cda918ff0450c8adcc8b69c2fd upstream. We were missing the methods for get_acl and friends for the 3.11 dialect. Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com> Signed-off-by: Steve French <stfrench@microsoft.com> CC: Stable <stable@vger.kernel.org> Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/cifs')
-rw-r--r--fs/cifs/smb2ops.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index ea92a38b2f08..6bf5f397c2c0 100644
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -3366,6 +3366,11 @@ struct smb_version_operations smb311_operations = {
.query_all_EAs = smb2_query_eas,
.set_EA = smb2_set_ea,
#endif /* CIFS_XATTR */
+#ifdef CONFIG_CIFS_ACL
+ .get_acl = get_smb2_acl,
+ .get_acl_by_fid = get_smb2_acl_by_fid,
+ .set_acl = set_smb2_acl,
+#endif /* CIFS_ACL */
.next_header = smb2_next_header,
};
#endif /* CIFS_SMB311 */