Skip to content

L
linux
Commit 36514876 authored by ChenXiaoSong's avatar ChenXiaoSong Committed by Steve French
Browse files
Options

smb/client: rename cifs_ntsd to smb_ntsd 

Preparation for moving acl definitions to new common header file.

Use the following shell command to rename:

  find fs/smb/client -type f -exec sed -i \
    's/struct cifs_ntsd/struct smb_ntsd/g' {} +
Signed-off-by: default avatarChenXiaoSong <chenxiaosong@kylinos.cn>
Reviewed-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 98f7e32f
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 49 deletions
fs/smb/client/cifsacl.c
View file @ 36514876
...@@ -515,8 +515,8 @@ exit_cifs_idmap(void) ...@@ -515,8 +515,8 @@ exit_cifs_idmap(void)
} }
/* copy ntsd, owner sid, and group sid from a security descriptor to another */ /* copy ntsd, owner sid, and group sid from a security descriptor to another */
static __u32 copy_sec_desc(const struct cifs_ntsd *pntsd, static __u32 copy_sec_desc(const struct smb_ntsd *pntsd,
struct cifs_ntsd *pnntsd, struct smb_ntsd *pnntsd,
__u32 sidsoffset, __u32 sidsoffset,
struct cifs_sid *pownersid, struct cifs_sid *pownersid,
struct cifs_sid *pgrpsid) struct cifs_sid *pgrpsid)
...@@ -527,7 +527,7 @@ static __u32 copy_sec_desc(const struct cifs_ntsd *pntsd, ...@@ -527,7 +527,7 @@ static __u32 copy_sec_desc(const struct cifs_ntsd *pntsd,
/* copy security descriptor control portion */ /* copy security descriptor control portion */
pnntsd->revision = pntsd->revision; pnntsd->revision = pntsd->revision;
pnntsd->type = pntsd->type; pnntsd->type = pntsd->type;
pnntsd->dacloffset = cpu_to_le32(sizeof(struct cifs_ntsd)); pnntsd->dacloffset = cpu_to_le32(sizeof(struct smb_ntsd));
pnntsd->sacloffset = 0; pnntsd->sacloffset = 0;
pnntsd->osidoffset = cpu_to_le32(sidsoffset); pnntsd->osidoffset = cpu_to_le32(sidsoffset);
pnntsd->gsidoffset = cpu_to_le32(sidsoffset + sizeof(struct cifs_sid)); pnntsd->gsidoffset = cpu_to_le32(sidsoffset + sizeof(struct cifs_sid));
...@@ -1191,7 +1191,7 @@ static int parse_sid(struct cifs_sid *psid, char *end_of_acl) ...@@ -1191,7 +1191,7 @@ static int parse_sid(struct cifs_sid *psid, char *end_of_acl)
/* Convert CIFS ACL to POSIX form */ /* Convert CIFS ACL to POSIX form */
static int parse_sec_desc(struct cifs_sb_info *cifs_sb, static int parse_sec_desc(struct cifs_sb_info *cifs_sb,
struct cifs_ntsd *pntsd, int acl_len, struct cifs_fattr *fattr, struct smb_ntsd *pntsd, int acl_len, struct cifs_fattr *fattr,
bool get_mode_from_special_sid) bool get_mode_from_special_sid)
{ {
int rc = 0; int rc = 0;
...@@ -1249,7 +1249,7 @@ static int parse_sec_desc(struct cifs_sb_info *cifs_sb, ...@@ -1249,7 +1249,7 @@ static int parse_sec_desc(struct cifs_sb_info *cifs_sb,
} }
/* Convert permission bits from mode to equivalent CIFS ACL */ /* Convert permission bits from mode to equivalent CIFS ACL */
static int build_sec_desc(struct cifs_ntsd *pntsd, struct cifs_ntsd *pnntsd, static int build_sec_desc(struct smb_ntsd *pntsd, struct smb_ntsd *pnntsd,
__u32 secdesclen, __u32 *pnsecdesclen, __u64 *pnmode, kuid_t uid, kgid_t gid, __u32 secdesclen, __u32 *pnsecdesclen, __u64 *pnmode, kuid_t uid, kgid_t gid,
bool mode_from_sid, bool id_from_sid, int *aclflag) bool mode_from_sid, bool id_from_sid, int *aclflag)
{ {
...@@ -1279,7 +1279,7 @@ static int build_sec_desc(struct cifs_ntsd *pntsd, struct cifs_ntsd *pnntsd, ...@@ -1279,7 +1279,7 @@ static int build_sec_desc(struct cifs_ntsd *pntsd, struct cifs_ntsd *pnntsd,
le32_to_cpu(pntsd->gsidoffset)); le32_to_cpu(pntsd->gsidoffset));
if (pnmode && *pnmode != NO_CHANGE_64) { /* chmod */ if (pnmode && *pnmode != NO_CHANGE_64) { /* chmod */
ndacloffset = sizeof(struct cifs_ntsd); ndacloffset = sizeof(struct smb_ntsd);
ndacl_ptr = (struct cifs_acl *)((char *)pnntsd + ndacloffset); ndacl_ptr = (struct cifs_acl *)((char *)pnntsd + ndacloffset);
ndacl_ptr->revision = ndacl_ptr->revision =
dacloffset ? dacl_ptr->revision : cpu_to_le16(ACL_REVISION); dacloffset ? dacl_ptr->revision : cpu_to_le16(ACL_REVISION);
...@@ -1297,7 +1297,7 @@ static int build_sec_desc(struct cifs_ntsd *pntsd, struct cifs_ntsd *pnntsd, ...@@ -1297,7 +1297,7 @@ static int build_sec_desc(struct cifs_ntsd *pntsd, struct cifs_ntsd *pnntsd,
*aclflag |= CIFS_ACL_DACL; *aclflag |= CIFS_ACL_DACL;
} else { } else {
ndacloffset = sizeof(struct cifs_ntsd); ndacloffset = sizeof(struct smb_ntsd);
ndacl_ptr = (struct cifs_acl *)((char *)pnntsd + ndacloffset); ndacl_ptr = (struct cifs_acl *)((char *)pnntsd + ndacloffset);
ndacl_ptr->revision = ndacl_ptr->revision =
dacloffset ? dacl_ptr->revision : cpu_to_le16(ACL_REVISION); dacloffset ? dacl_ptr->revision : cpu_to_le16(ACL_REVISION);
...@@ -1385,11 +1385,11 @@ static int build_sec_desc(struct cifs_ntsd *pntsd, struct cifs_ntsd *pnntsd, ...@@ -1385,11 +1385,11 @@ static int build_sec_desc(struct cifs_ntsd *pntsd, struct cifs_ntsd *pnntsd,
} }
#ifdef CONFIG_CIFS_ALLOW_INSECURE_LEGACY #ifdef CONFIG_CIFS_ALLOW_INSECURE_LEGACY
struct cifs_ntsd *get_cifs_acl_by_fid(struct cifs_sb_info *cifs_sb, struct smb_ntsd *get_cifs_acl_by_fid(struct cifs_sb_info *cifs_sb,
const struct cifs_fid *cifsfid, u32 *pacllen, const struct cifs_fid *cifsfid, u32 *pacllen,
u32 __maybe_unused unused) u32 __maybe_unused unused)
{ {
struct cifs_ntsd *pntsd = NULL; struct smb_ntsd *pntsd = NULL;
unsigned int xid; unsigned int xid;
int rc; int rc;
struct tcon_link *tlink = cifs_sb_tlink(cifs_sb); struct tcon_link *tlink = cifs_sb_tlink(cifs_sb);
...@@ -1410,10 +1410,10 @@ struct cifs_ntsd *get_cifs_acl_by_fid(struct cifs_sb_info *cifs_sb, ...@@ -1410,10 +1410,10 @@ struct cifs_ntsd *get_cifs_acl_by_fid(struct cifs_sb_info *cifs_sb,
return pntsd; return pntsd;
} }
static struct cifs_ntsd *get_cifs_acl_by_path(struct cifs_sb_info *cifs_sb, static struct smb_ntsd *get_cifs_acl_by_path(struct cifs_sb_info *cifs_sb,
const char *path, u32 *pacllen) const char *path, u32 *pacllen)
{ {
struct cifs_ntsd *pntsd = NULL; struct smb_ntsd *pntsd = NULL;
int oplock = 0; int oplock = 0;
unsigned int xid; unsigned int xid;
int rc; int rc;
...@@ -1454,11 +1454,11 @@ static struct cifs_ntsd *get_cifs_acl_by_path(struct cifs_sb_info *cifs_sb, ...@@ -1454,11 +1454,11 @@ static struct cifs_ntsd *get_cifs_acl_by_path(struct cifs_sb_info *cifs_sb,
} }
/* Retrieve an ACL from the server */ /* Retrieve an ACL from the server */
struct cifs_ntsd *get_cifs_acl(struct cifs_sb_info *cifs_sb, struct smb_ntsd *get_cifs_acl(struct cifs_sb_info *cifs_sb,
struct inode *inode, const char *path, struct inode *inode, const char *path,
u32 *pacllen, u32 info) u32 *pacllen, u32 info)
{ {
struct cifs_ntsd *pntsd = NULL; struct smb_ntsd *pntsd = NULL;
struct cifsFileInfo *open_file = NULL; struct cifsFileInfo *open_file = NULL;
if (inode) if (inode)
...@@ -1472,7 +1472,7 @@ struct cifs_ntsd *get_cifs_acl(struct cifs_sb_info *cifs_sb, ...@@ -1472,7 +1472,7 @@ struct cifs_ntsd *get_cifs_acl(struct cifs_sb_info *cifs_sb,
} }
/* Set an ACL on the server */ /* Set an ACL on the server */
int set_cifs_acl(struct cifs_ntsd *pnntsd, __u32 acllen, int set_cifs_acl(struct smb_ntsd *pnntsd, __u32 acllen,
struct inode *inode, const char *path, int aclflag) struct inode *inode, const char *path, int aclflag)
{ {
int oplock = 0; int oplock = 0;
...@@ -1528,7 +1528,7 @@ cifs_acl_to_fattr(struct cifs_sb_info *cifs_sb, struct cifs_fattr *fattr, ...@@ -1528,7 +1528,7 @@ cifs_acl_to_fattr(struct cifs_sb_info *cifs_sb, struct cifs_fattr *fattr,
struct inode *inode, bool mode_from_special_sid, struct inode *inode, bool mode_from_special_sid,
const char *path, const struct cifs_fid *pfid) const char *path, const struct cifs_fid *pfid)
{ {
struct cifs_ntsd *pntsd = NULL; struct smb_ntsd *pntsd = NULL;
u32 acllen = 0; u32 acllen = 0;
int rc = 0; int rc = 0;
struct tcon_link *tlink = cifs_sb_tlink(cifs_sb); struct tcon_link *tlink = cifs_sb_tlink(cifs_sb);
...@@ -1581,8 +1581,8 @@ id_mode_to_cifs_acl(struct inode *inode, const char *path, __u64 *pnmode, ...@@ -1581,8 +1581,8 @@ id_mode_to_cifs_acl(struct inode *inode, const char *path, __u64 *pnmode,
__u32 nsecdesclen = 0; __u32 nsecdesclen = 0;
__u32 dacloffset = 0; __u32 dacloffset = 0;
struct cifs_acl *dacl_ptr = NULL; struct cifs_acl *dacl_ptr = NULL;
struct cifs_ntsd *pntsd = NULL; /* acl obtained from server */ struct smb_ntsd *pntsd = NULL; /* acl obtained from server */
struct cifs_ntsd *pnntsd = NULL; /* modified acl to be sent to server */ struct smb_ntsd *pnntsd = NULL; /* modified acl to be sent to server */
struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb); struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
struct tcon_link *tlink = cifs_sb_tlink(cifs_sb); struct tcon_link *tlink = cifs_sb_tlink(cifs_sb);
struct smb_version_operations *ops; struct smb_version_operations *ops;
...@@ -1630,7 +1630,7 @@ id_mode_to_cifs_acl(struct inode *inode, const char *path, __u64 *pnmode, ...@@ -1630,7 +1630,7 @@ id_mode_to_cifs_acl(struct inode *inode, const char *path, __u64 *pnmode,
nsecdesclen += 5 * sizeof(struct cifs_ace); nsecdesclen += 5 * sizeof(struct cifs_ace);
} else { /* chown */ } else { /* chown */
/* When ownership changes, changes new owner sid length could be different */ /* When ownership changes, changes new owner sid length could be different */
nsecdesclen = sizeof(struct cifs_ntsd) + (sizeof(struct cifs_sid) * 2); nsecdesclen = sizeof(struct smb_ntsd) + (sizeof(struct cifs_sid) * 2);
dacloffset = le32_to_cpu(pntsd->dacloffset); dacloffset = le32_to_cpu(pntsd->dacloffset);
if (dacloffset) { if (dacloffset) {
dacl_ptr = (struct cifs_acl *)((char *)pntsd + dacloffset); dacl_ptr = (struct cifs_acl *)((char *)pntsd + dacloffset);
......
fs/smb/client/cifsacl.h
View file @ 36514876
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
* Security Descriptor length containing DACL with 3 ACEs (one each for * Security Descriptor length containing DACL with 3 ACEs (one each for
* owner, group and world). * owner, group and world).
*/ */
#define DEFAULT_SEC_DESC_LEN (sizeof(struct cifs_ntsd) + \ #define DEFAULT_SEC_DESC_LEN (sizeof(struct smb_ntsd) + \
sizeof(struct cifs_acl) + \ sizeof(struct cifs_acl) + \
(sizeof(struct cifs_ace) * 4)) (sizeof(struct cifs_ace) * 4))
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
#define SID_STRING_BASE_SIZE (2 + 3 + 15 + 1) #define SID_STRING_BASE_SIZE (2 + 3 + 15 + 1)
#define SID_STRING_SUBAUTH_SIZE (11) /* size of a single subauth string */ #define SID_STRING_SUBAUTH_SIZE (11) /* size of a single subauth string */
struct cifs_ntsd { struct smb_ntsd {
__le16 revision; /* revision level */ __le16 revision; /* revision level */
__le16 type; __le16 type;
__le32 osidoffset; __le32 osidoffset;
...@@ -194,6 +194,6 @@ struct owner_group_sids { ...@@ -194,6 +194,6 @@ struct owner_group_sids {
* Minimum security descriptor can be one without any SACL and DACL and can * Minimum security descriptor can be one without any SACL and DACL and can
* consist of revision, type, and two sids of minimum size for owner and group * consist of revision, type, and two sids of minimum size for owner and group
*/ */
#define MIN_SEC_DESC_LEN (sizeof(struct cifs_ntsd) + (2 * MIN_SID_LEN)) #define MIN_SEC_DESC_LEN (sizeof(struct smb_ntsd) + (2 * MIN_SID_LEN))
#endif /* _CIFSACL_H */ #endif /* _CIFSACL_H */
fs/smb/client/cifsglob.h
View file @ 36514876
...@@ -536,12 +536,12 @@ struct smb_version_operations { ...@@ -536,12 +536,12 @@ struct smb_version_operations {
int (*set_EA)(const unsigned int, struct cifs_tcon *, const char *, int (*set_EA)(const unsigned int, struct cifs_tcon *, const char *,
const char *, const void *, const __u16, const char *, const void *, const __u16,
const struct nls_table *, struct cifs_sb_info *); const struct nls_table *, struct cifs_sb_info *);
struct cifs_ntsd * (*get_acl)(struct cifs_sb_info *, struct inode *, struct smb_ntsd * (*get_acl)(struct cifs_sb_info *cifssb, struct inode *ino,
const char *, u32 *, u32); const char *patch, u32 *plen, u32 info);
struct cifs_ntsd * (*get_acl_by_fid)(struct cifs_sb_info *, struct smb_ntsd * (*get_acl_by_fid)(struct cifs_sb_info *cifssmb,
const struct cifs_fid *, u32 *, u32); const struct cifs_fid *pfid, u32 *plen, u32 info);
int (*set_acl)(struct cifs_ntsd *, __u32, struct inode *, const char *, int (*set_acl)(struct smb_ntsd *pntsd, __u32 len, struct inode *ino, const char *path,
int); int flag);
/* writepages retry size */ /* writepages retry size */
unsigned int (*wp_retry_size)(struct inode *); unsigned int (*wp_retry_size)(struct inode *);
/* get mtu credits */ /* get mtu credits */
......
fs/smb/client/cifsproto.h
View file @ 36514876
...@@ -233,16 +233,16 @@ extern int cifs_acl_to_fattr(struct cifs_sb_info *cifs_sb, ...@@ -233,16 +233,16 @@ extern int cifs_acl_to_fattr(struct cifs_sb_info *cifs_sb,
const char *path, const struct cifs_fid *pfid); const char *path, const struct cifs_fid *pfid);
extern int id_mode_to_cifs_acl(struct inode *inode, const char *path, __u64 *pnmode, extern int id_mode_to_cifs_acl(struct inode *inode, const char *path, __u64 *pnmode,
kuid_t uid, kgid_t gid); kuid_t uid, kgid_t gid);
extern struct cifs_ntsd *get_cifs_acl(struct cifs_sb_info *, struct inode *, extern struct smb_ntsd *get_cifs_acl(struct cifs_sb_info *cifssmb, struct inode *ino,
const char *, u32 *, u32); const char *path, u32 *plen, u32 info);
extern struct cifs_ntsd *get_cifs_acl_by_fid(struct cifs_sb_info *, extern struct smb_ntsd *get_cifs_acl_by_fid(struct cifs_sb_info *cifssb,
const struct cifs_fid *, u32 *, u32); const struct cifs_fid *pfid, u32 *plen, u32 info);
extern struct posix_acl *cifs_get_acl(struct mnt_idmap *idmap, extern struct posix_acl *cifs_get_acl(struct mnt_idmap *idmap,
struct dentry *dentry, int type); struct dentry *dentry, int type);
extern int cifs_set_acl(struct mnt_idmap *idmap, extern int cifs_set_acl(struct mnt_idmap *idmap,
struct dentry *dentry, struct posix_acl *acl, int type); struct dentry *dentry, struct posix_acl *acl, int type);
extern int set_cifs_acl(struct cifs_ntsd *, __u32, struct inode *, extern int set_cifs_acl(struct smb_ntsd *pntsd, __u32 len, struct inode *ino,
const char *, int); const char *path, int flag);
extern unsigned int setup_authusers_ACE(struct cifs_ace *pace); extern unsigned int setup_authusers_ACE(struct cifs_ace *pace);
extern unsigned int setup_special_mode_ACE(struct cifs_ace *pace, __u64 nmode); extern unsigned int setup_special_mode_ACE(struct cifs_ace *pace, __u64 nmode);
extern unsigned int setup_special_user_owner_ACE(struct cifs_ace *pace); extern unsigned int setup_special_user_owner_ACE(struct cifs_ace *pace);
...@@ -570,9 +570,9 @@ extern int CIFSSMBSetEA(const unsigned int xid, struct cifs_tcon *tcon, ...@@ -570,9 +570,9 @@ extern int CIFSSMBSetEA(const unsigned int xid, struct cifs_tcon *tcon,
const struct nls_table *nls_codepage, const struct nls_table *nls_codepage,
struct cifs_sb_info *cifs_sb); struct cifs_sb_info *cifs_sb);
extern int CIFSSMBGetCIFSACL(const unsigned int xid, struct cifs_tcon *tcon, extern int CIFSSMBGetCIFSACL(const unsigned int xid, struct cifs_tcon *tcon,
__u16 fid, struct cifs_ntsd **acl_inf, __u32 *buflen); __u16 fid, struct smb_ntsd **acl_inf, __u32 *buflen);
extern int CIFSSMBSetCIFSACL(const unsigned int, struct cifs_tcon *, __u16, extern int CIFSSMBSetCIFSACL(const unsigned int, struct cifs_tcon *, __u16,
struct cifs_ntsd *, __u32, int); struct smb_ntsd *pntsd, __u32 len, int aclflag);
extern int cifs_do_get_acl(const unsigned int xid, struct cifs_tcon *tcon, extern int cifs_do_get_acl(const unsigned int xid, struct cifs_tcon *tcon,
const unsigned char *searchName, const unsigned char *searchName,
struct posix_acl **acl, const int acl_type, struct posix_acl **acl, const int acl_type,
......
fs/smb/client/cifssmb.c
View file @ 36514876
...@@ -3428,7 +3428,7 @@ validate_ntransact(char *buf, char **ppparm, char **ppdata, ...@@ -3428,7 +3428,7 @@ validate_ntransact(char *buf, char **ppparm, char **ppdata,
/* Get Security Descriptor (by handle) from remote server for a file or dir */ /* Get Security Descriptor (by handle) from remote server for a file or dir */
int int
CIFSSMBGetCIFSACL(const unsigned int xid, struct cifs_tcon *tcon, __u16 fid, CIFSSMBGetCIFSACL(const unsigned int xid, struct cifs_tcon *tcon, __u16 fid,
struct cifs_ntsd **acl_inf, __u32 *pbuflen) struct smb_ntsd **acl_inf, __u32 *pbuflen)
{ {
int rc = 0; int rc = 0;
int buf_type = 0; int buf_type = 0;
...@@ -3498,7 +3498,7 @@ CIFSSMBGetCIFSACL(const unsigned int xid, struct cifs_tcon *tcon, __u16 fid, ...@@ -3498,7 +3498,7 @@ CIFSSMBGetCIFSACL(const unsigned int xid, struct cifs_tcon *tcon, __u16 fid,
/* check if buffer is big enough for the acl /* check if buffer is big enough for the acl
header followed by the smallest SID */ header followed by the smallest SID */
if ((*pbuflen < sizeof(struct cifs_ntsd) + 8) || if ((*pbuflen < sizeof(struct smb_ntsd) + 8) ||
(*pbuflen >= 64 * 1024)) { (*pbuflen >= 64 * 1024)) {
cifs_dbg(VFS, "bad acl length %d\n", *pbuflen); cifs_dbg(VFS, "bad acl length %d\n", *pbuflen);
rc = -EINVAL; rc = -EINVAL;
...@@ -3518,7 +3518,7 @@ CIFSSMBGetCIFSACL(const unsigned int xid, struct cifs_tcon *tcon, __u16 fid, ...@@ -3518,7 +3518,7 @@ CIFSSMBGetCIFSACL(const unsigned int xid, struct cifs_tcon *tcon, __u16 fid,
int int
CIFSSMBSetCIFSACL(const unsigned int xid, struct cifs_tcon *tcon, __u16 fid, CIFSSMBSetCIFSACL(const unsigned int xid, struct cifs_tcon *tcon, __u16 fid,
struct cifs_ntsd *pntsd, __u32 acllen, int aclflag) struct smb_ntsd *pntsd, __u32 acllen, int aclflag)
{ {
__u16 byte_count, param_count, data_count, param_offset, data_offset; __u16 byte_count, param_count, data_count, param_offset, data_offset;
int rc = 0; int rc = 0;
......
fs/smb/client/smb2ops.c
View file @ 36514876
...@@ -3048,11 +3048,11 @@ smb2_get_dfs_refer(const unsigned int xid, struct cifs_ses *ses, ...@@ -3048,11 +3048,11 @@ smb2_get_dfs_refer(const unsigned int xid, struct cifs_ses *ses,
return rc; return rc;
} }
static struct cifs_ntsd * static struct smb_ntsd *
get_smb2_acl_by_fid(struct cifs_sb_info *cifs_sb, get_smb2_acl_by_fid(struct cifs_sb_info *cifs_sb,
const struct cifs_fid *cifsfid, u32 *pacllen, u32 info) const struct cifs_fid *cifsfid, u32 *pacllen, u32 info)
{ {
struct cifs_ntsd *pntsd = NULL; struct smb_ntsd *pntsd = NULL;
unsigned int xid; unsigned int xid;
int rc = -EOPNOTSUPP; int rc = -EOPNOTSUPP;
struct tcon_link *tlink = cifs_sb_tlink(cifs_sb); struct tcon_link *tlink = cifs_sb_tlink(cifs_sb);
...@@ -3077,11 +3077,11 @@ get_smb2_acl_by_fid(struct cifs_sb_info *cifs_sb, ...@@ -3077,11 +3077,11 @@ get_smb2_acl_by_fid(struct cifs_sb_info *cifs_sb,
} }
static struct cifs_ntsd * static struct smb_ntsd *
get_smb2_acl_by_path(struct cifs_sb_info *cifs_sb, get_smb2_acl_by_path(struct cifs_sb_info *cifs_sb,
const char *path, u32 *pacllen, u32 info) const char *path, u32 *pacllen, u32 info)
{ {
struct cifs_ntsd *pntsd = NULL; struct smb_ntsd *pntsd = NULL;
u8 oplock = SMB2_OPLOCK_LEVEL_NONE; u8 oplock = SMB2_OPLOCK_LEVEL_NONE;
unsigned int xid; unsigned int xid;
int rc; int rc;
...@@ -3144,7 +3144,7 @@ get_smb2_acl_by_path(struct cifs_sb_info *cifs_sb, ...@@ -3144,7 +3144,7 @@ get_smb2_acl_by_path(struct cifs_sb_info *cifs_sb,
} }
static int static int
set_smb2_acl(struct cifs_ntsd *pnntsd, __u32 acllen, set_smb2_acl(struct smb_ntsd *pnntsd, __u32 acllen,
struct inode *inode, const char *path, int aclflag) struct inode *inode, const char *path, int aclflag)
{ {
u8 oplock = SMB2_OPLOCK_LEVEL_NONE; u8 oplock = SMB2_OPLOCK_LEVEL_NONE;
...@@ -3202,12 +3202,12 @@ set_smb2_acl(struct cifs_ntsd *pnntsd, __u32 acllen, ...@@ -3202,12 +3202,12 @@ set_smb2_acl(struct cifs_ntsd *pnntsd, __u32 acllen,
} }
/* Retrieve an ACL from the server */ /* Retrieve an ACL from the server */
static struct cifs_ntsd * static struct smb_ntsd *
get_smb2_acl(struct cifs_sb_info *cifs_sb, get_smb2_acl(struct cifs_sb_info *cifs_sb,
struct inode *inode, const char *path, struct inode *inode, const char *path,
u32 *pacllen, u32 info) u32 *pacllen, u32 info)
{ {
struct cifs_ntsd *pntsd = NULL; struct smb_ntsd *pntsd = NULL;
struct cifsFileInfo *open_file = NULL; struct cifsFileInfo *open_file = NULL;
if (inode && !(info & SACL_SECINFO)) if (inode && !(info & SACL_SECINFO))
......
fs/smb/client/smb2pdu.c
View file @ 36514876
...@@ -5683,7 +5683,7 @@ SMB2_set_eof(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid, ...@@ -5683,7 +5683,7 @@ SMB2_set_eof(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,
int int
SMB2_set_acl(const unsigned int xid, struct cifs_tcon *tcon, SMB2_set_acl(const unsigned int xid, struct cifs_tcon *tcon,
u64 persistent_fid, u64 volatile_fid, u64 persistent_fid, u64 volatile_fid,
struct cifs_ntsd *pnntsd, int pacllen, int aclflag) struct smb_ntsd *pnntsd, int pacllen, int aclflag)
{ {
return send_set_info(xid, tcon, persistent_fid, volatile_fid, return send_set_info(xid, tcon, persistent_fid, volatile_fid,
current->tgid, 0, SMB2_O_INFO_SECURITY, aclflag, current->tgid, 0, SMB2_O_INFO_SECURITY, aclflag,
......
fs/smb/client/smb2proto.h
View file @ 36514876
...@@ -238,7 +238,7 @@ extern int SMB2_set_info_init(struct cifs_tcon *tcon, ...@@ -238,7 +238,7 @@ extern int SMB2_set_info_init(struct cifs_tcon *tcon,
extern void SMB2_set_info_free(struct smb_rqst *rqst); extern void SMB2_set_info_free(struct smb_rqst *rqst);
extern int SMB2_set_acl(const unsigned int xid, struct cifs_tcon *tcon, extern int SMB2_set_acl(const unsigned int xid, struct cifs_tcon *tcon,
u64 persistent_fid, u64 volatile_fid, u64 persistent_fid, u64 volatile_fid,
struct cifs_ntsd *pnntsd, int pacllen, int aclflag); struct smb_ntsd *pnntsd, int pacllen, int aclflag);
extern int SMB2_set_ea(const unsigned int xid, struct cifs_tcon *tcon, extern int SMB2_set_ea(const unsigned int xid, struct cifs_tcon *tcon,
u64 persistent_fid, u64 volatile_fid, u64 persistent_fid, u64 volatile_fid,
struct smb2_file_full_ea_info *buf, int len); struct smb2_file_full_ea_info *buf, int len);
......
fs/smb/client/xattr.c
View file @ 36514876
...@@ -162,7 +162,7 @@ static int cifs_xattr_set(const struct xattr_handler *handler, ...@@ -162,7 +162,7 @@ static int cifs_xattr_set(const struct xattr_handler *handler,
case XATTR_CIFS_ACL: case XATTR_CIFS_ACL:
case XATTR_CIFS_NTSD: case XATTR_CIFS_NTSD:
case XATTR_CIFS_NTSD_FULL: { case XATTR_CIFS_NTSD_FULL: {
struct cifs_ntsd *pacl; struct smb_ntsd *pacl;
if (!value) if (!value)
goto out; goto out;
...@@ -315,7 +315,7 @@ static int cifs_xattr_get(const struct xattr_handler *handler, ...@@ -315,7 +315,7 @@ static int cifs_xattr_get(const struct xattr_handler *handler,
* fetch owner and DACL otherwise * fetch owner and DACL otherwise
*/ */
u32 acllen, extra_info; u32 acllen, extra_info;
struct cifs_ntsd *pacl; struct smb_ntsd *pacl;
if (pTcon->ses->server->ops->get_acl == NULL) if (pTcon->ses->server->ops->get_acl == NULL)
goto out; /* rc already EOPNOTSUPP */ goto out; /* rc already EOPNOTSUPP */
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7