diff options
| author | Steve French <smfrench@gmail.com> | 2014-02-02 23:31:47 -0600 |
|---|---|---|
| committer | Steve French <smfrench@gmail.com> | 2014-02-07 11:08:17 -0600 |
| commit | 83e3bc23ef9ce7c03b7b4e5d3d790246ea59db3e (patch) | |
| tree | 956aac2ae24b12abc9be303bd74a890c480b434b /fs/cifs/cifsglob.h | |
| parent | d979f3b0a1f0b5499ab85e68cdf02b56852918b6 (diff) | |
| download | op-kernel-dev-83e3bc23ef9ce7c03b7b4e5d3d790246ea59db3e.zip op-kernel-dev-83e3bc23ef9ce7c03b7b4e5d3d790246ea59db3e.tar.gz | |
retrieving CIFS ACLs when mounted with SMB2 fails dropping session
The get/set ACL xattr support for CIFS ACLs attempts to send old
cifs dialect protocol requests even when mounted with SMB2 or later
dialects. Sending cifs requests on an smb2 session causes problems -
the server drops the session due to the illegal request.
This patch makes CIFS ACL operations protocol specific to fix that.
Attempting to query/set CIFS ACLs for SMB2 will now return
EOPNOTSUPP (until we add worker routines for sending query
ACL requests via SMB2) instead of sending invalid (cifs)
requests.
A separate followon patch will be needed to fix cifs_acl_to_fattr
(which takes a cifs specific u16 fid so can't be abstracted
to work with SMB2 until that is changed) and will be needed
to fix mount problems when "cifsacl" is specified on mount
with e.g. vers=2.1
Signed-off-by: Steve French <smfrench@gmail.com>
Reviewed-by: Shirish Pargaonkar <spargaonkar@suse.com>
CC: Stable <stable@kernel.org>
Diffstat (limited to 'fs/cifs/cifsglob.h')
| -rw-r--r-- | fs/cifs/cifsglob.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index a245d18..615e35a 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h @@ -395,6 +395,10 @@ struct smb_version_operations { int (*set_EA)(const unsigned int, struct cifs_tcon *, const char *, const char *, const void *, const __u16, const struct nls_table *, int); + struct cifs_ntsd * (*get_acl)(struct cifs_sb_info *, struct inode *, + const char *, u32 *); + int (*set_acl)(struct cifs_ntsd *, __u32, struct inode *, const char *, + int); }; struct smb_version_values { |
