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

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

fs/smb/client/cifsacl.c

+18 −18
Original line number Diff line number Diff line
@@ -515,8 +515,8 @@ exit_cifs_idmap(void) 
}



/* copy ntsd, owner sid, and group sid from a security descriptor to another */

static __u32 copy_sec_desc(const struct cifs_ntsd *pntsd,

				struct cifs_ntsd *pnntsd,

static __u32 copy_sec_desc(const struct smb_ntsd *pntsd,

				struct smb_ntsd *pnntsd,

				__u32 sidsoffset,

				struct cifs_sid *pownersid,

				struct cifs_sid *pgrpsid)
@@ -527,7 +527,7 @@ static __u32 copy_sec_desc(const struct cifs_ntsd *pntsd, 
	/* copy security descriptor control portion */

	pnntsd->revision = pntsd->revision;

	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->osidoffset = cpu_to_le32(sidsoffset);

	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) 


/* Convert CIFS ACL to POSIX form */

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)

{

	int rc = 0;
@@ -1249,7 +1249,7 @@ static int parse_sec_desc(struct cifs_sb_info *cifs_sb, 
}



/* 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,

	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, 
			le32_to_cpu(pntsd->gsidoffset));



	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->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, 


		*aclflag |= CIFS_ACL_DACL;

	} else {

		ndacloffset = sizeof(struct cifs_ntsd);

		ndacloffset = sizeof(struct smb_ntsd);

		ndacl_ptr = (struct cifs_acl *)((char *)pnntsd + ndacloffset);

		ndacl_ptr->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, 
}



#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,

				      u32 __maybe_unused unused)

{

	struct cifs_ntsd *pntsd = NULL;

	struct smb_ntsd *pntsd = NULL;

	unsigned int xid;

	int rc;

	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, 
	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)

{

	struct cifs_ntsd *pntsd = NULL;

	struct smb_ntsd *pntsd = NULL;

	int oplock = 0;

	unsigned int xid;

	int rc;
@@ -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 */

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,

			       u32 *pacllen, u32 info)

{

	struct cifs_ntsd *pntsd = NULL;

	struct smb_ntsd *pntsd = NULL;

	struct cifsFileInfo *open_file = NULL;



	if (inode)
@@ -1472,7 +1472,7 @@ struct cifs_ntsd *get_cifs_acl(struct cifs_sb_info *cifs_sb, 
}



 /* 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)

{

	int oplock = 0;
@@ -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,

		  const char *path, const struct cifs_fid *pfid)

{

	struct cifs_ntsd *pntsd = NULL;

	struct smb_ntsd *pntsd = NULL;

	u32 acllen = 0;

	int rc = 0;

	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, 
	__u32 nsecdesclen = 0;

	__u32 dacloffset = 0;

	struct cifs_acl *dacl_ptr = NULL;

	struct cifs_ntsd *pntsd = NULL; /* acl obtained from server */

	struct cifs_ntsd *pnntsd = NULL; /* modified acl to be sent to server */

	struct smb_ntsd *pntsd = NULL; /* acl obtained from 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 tcon_link *tlink = cifs_sb_tlink(cifs_sb);

	struct smb_version_operations *ops;
@@ -1630,7 +1630,7 @@ id_mode_to_cifs_acl(struct inode *inode, const char *path, __u64 *pnmode, 
			nsecdesclen += 5 * sizeof(struct cifs_ace);

	} else { /* chown */

		/* 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);

		if (dacloffset) {

			dacl_ptr = (struct cifs_acl *)((char *)pntsd + dacloffset);

fs/smb/client/cifsacl.h

+3 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
 * Security Descriptor length containing DACL with 3 ACEs (one each for

 * 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_ace) * 4))
@@ -55,7 +55,7 @@ 
#define SID_STRING_BASE_SIZE (2 + 3 + 15 + 1)

#define SID_STRING_SUBAUTH_SIZE (11) /* size of a single subauth string */



struct cifs_ntsd {

struct smb_ntsd {

	__le16 revision; /* revision level */

	__le16 type;

	__le32 osidoffset;
@@ -194,6 +194,6 @@ struct owner_group_sids { 
 * 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

 */

#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 */

fs/smb/client/cifsglob.h

+6 −6
Original line number Diff line number Diff line
@@ -536,12 +536,12 @@ 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 *, struct cifs_sb_info *);

	struct cifs_ntsd * (*get_acl)(struct cifs_sb_info *, struct inode *,

			const char *, u32 *, u32);

	struct cifs_ntsd * (*get_acl_by_fid)(struct cifs_sb_info *,

			const struct cifs_fid *, u32 *, u32);

	int (*set_acl)(struct cifs_ntsd *, __u32, struct inode *, const char *,

			int);

	struct smb_ntsd * (*get_acl)(struct cifs_sb_info *cifssb, struct inode *ino,

			const char *patch, u32 *plen, u32 info);

	struct smb_ntsd * (*get_acl_by_fid)(struct cifs_sb_info *cifssmb,

			const struct cifs_fid *pfid, u32 *plen, u32 info);

	int (*set_acl)(struct smb_ntsd *pntsd, __u32 len, struct inode *ino, const char *path,

			int flag);

	/* writepages retry size */

	unsigned int (*wp_retry_size)(struct inode *);

	/* get mtu credits */

fs/smb/client/cifsproto.h

+8 −8
Original line number Diff line number Diff line
@@ -233,16 +233,16 @@ extern int cifs_acl_to_fattr(struct cifs_sb_info *cifs_sb, 
			      const char *path, const struct cifs_fid *pfid);

extern int id_mode_to_cifs_acl(struct inode *inode, const char *path, __u64 *pnmode,

					kuid_t uid, kgid_t gid);

extern struct cifs_ntsd *get_cifs_acl(struct cifs_sb_info *, struct inode *,

				      const char *, u32 *, u32);

extern struct cifs_ntsd *get_cifs_acl_by_fid(struct cifs_sb_info *,

				const struct cifs_fid *, u32 *, u32);

extern struct smb_ntsd *get_cifs_acl(struct cifs_sb_info *cifssmb, struct inode *ino,

				      const char *path, u32 *plen, u32 info);

extern struct smb_ntsd *get_cifs_acl_by_fid(struct cifs_sb_info *cifssb,

				const struct cifs_fid *pfid, u32 *plen, u32 info);

extern struct posix_acl *cifs_get_acl(struct mnt_idmap *idmap,

				      struct dentry *dentry, int type);

extern int cifs_set_acl(struct mnt_idmap *idmap,

			struct dentry *dentry, struct posix_acl *acl, int type);

extern int set_cifs_acl(struct cifs_ntsd *, __u32, struct inode *,

				const char *, int);

extern int set_cifs_acl(struct smb_ntsd *pntsd, __u32 len, struct inode *ino,

				const char *path, int flag);

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_user_owner_ACE(struct cifs_ace *pace);
@@ -570,9 +570,9 @@ extern int CIFSSMBSetEA(const unsigned int xid, struct cifs_tcon *tcon, 
		const struct nls_table *nls_codepage,

		struct cifs_sb_info *cifs_sb);

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,

			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,

			   const unsigned char *searchName,

			   struct posix_acl **acl, const int acl_type,

fs/smb/client/cifssmb.c

+3 −3
Original line number Diff line number Diff line
@@ -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 */

int

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 buf_type = 0;
@@ -3498,7 +3498,7 @@ CIFSSMBGetCIFSACL(const unsigned int xid, struct cifs_tcon *tcon, __u16 fid, 


		/* check if buffer is big enough for the acl

		   header followed by the smallest SID */

		if ((*pbuflen < sizeof(struct cifs_ntsd) + 8) ||

		if ((*pbuflen < sizeof(struct smb_ntsd) + 8) ||

		    (*pbuflen >= 64 * 1024)) {

			cifs_dbg(VFS, "bad acl length %d\n", *pbuflen);

			rc = -EINVAL;
@@ -3518,7 +3518,7 @@ CIFSSMBGetCIFSACL(const unsigned int xid, struct cifs_tcon *tcon, __u16 fid, 


int

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;

	int rc = 0;