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: ChenXiaoSong <chenxiaosong@kylinos.cn>
Reviewed-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>

diff --git a/fs/smb/client/cifsacl.c b/fs/smb/client/cifsacl.c
index f5b6df82e8570a627c6c2a2a6b730aa2291b1e60..3f7657475cd93b9498bdf23ab6769fec656eacb7 100644 (file)
--- a/fs/smb/client/cifsacl.c
+++ b/fs/smb/client/cifsacl.c
@@ -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 @@ chown_chgrp_exit:
 }
 
 #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);

diff --git a/fs/smb/client/cifsacl.h b/fs/smb/client/cifsacl.h
index ccbfc754bd3c7fb0ae0e32b10b28318027a9ae06..1516545d7f67e5a210f3d723a0ff8c459176fcb1 100644 (file)
--- a/fs/smb/client/cifsacl.h
+++ b/fs/smb/client/cifsacl.h
@@ -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 */

diff --git a/fs/smb/client/cifsglob.h b/fs/smb/client/cifsglob.h
index 9eae8649f90c382394b0bdd3bb1678d5ede2ca0b..05f23d54039c6b4ea9ab85794d128a10f56a28a6 100644 (file)
--- a/fs/smb/client/cifsglob.h
+++ b/fs/smb/client/cifsglob.h
@@ -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 */

diff --git a/fs/smb/client/cifsproto.h b/fs/smb/client/cifsproto.h
index 497bf3c447bcb59486feed877560bd920d91a70e..442acf199a763bc5ecfb944c630dfee9ca3d4908 100644 (file)
--- a/fs/smb/client/cifsproto.h
+++ b/fs/smb/client/cifsproto.h
@@ -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,

diff --git a/fs/smb/client/cifssmb.c b/fs/smb/client/cifssmb.c
index cfae2e91820994f4aeded6dad23ed09ea65c5220..39b625d7e0d005ebbbb38c4d45bf49f6a97bc307 100644 (file)
--- a/fs/smb/client/cifssmb.c
+++ b/fs/smb/client/cifssmb.c
@@ -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 @@ qsec_out:
 
 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;

diff --git a/fs/smb/client/smb2ops.c b/fs/smb/client/smb2ops.c
index e6540072ffb0e1ec63d1fc36122fc1e29f6064c9..d6e317640eeba97d2a5cf04ed8751f571916cf0d 100644 (file)
--- a/fs/smb/client/smb2ops.c
+++ b/fs/smb/client/smb2ops.c
@@ -3048,11 +3048,11 @@ smb2_get_dfs_refer(const unsigned int xid, struct cifs_ses *ses,
        return rc;
 }
 
-static struct cifs_ntsd *
+static struct smb_ntsd *
 get_smb2_acl_by_fid(struct cifs_sb_info *cifs_sb,
                    const struct cifs_fid *cifsfid, u32 *pacllen, u32 info)
 {
-       struct cifs_ntsd *pntsd = NULL;
+       struct smb_ntsd *pntsd = NULL;
        unsigned int xid;
        int rc = -EOPNOTSUPP;
        struct tcon_link *tlink = cifs_sb_tlink(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,
                     const char *path, u32 *pacllen, u32 info)
 {
-       struct cifs_ntsd *pntsd = NULL;
+       struct smb_ntsd *pntsd = NULL;
        u8 oplock = SMB2_OPLOCK_LEVEL_NONE;
        unsigned int xid;
        int rc;
@@ -3144,7 +3144,7 @@ get_smb2_acl_by_path(struct cifs_sb_info *cifs_sb,
 }
 
 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)
 {
        u8 oplock = SMB2_OPLOCK_LEVEL_NONE;
@@ -3202,12 +3202,12 @@ set_smb2_acl(struct cifs_ntsd *pnntsd, __u32 acllen,
 }
 
 /* Retrieve an ACL from the server */
-static struct cifs_ntsd *
+static struct smb_ntsd *
 get_smb2_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 && !(info & SACL_SECINFO))

diff --git a/fs/smb/client/smb2pdu.c b/fs/smb/client/smb2pdu.c
index 88dc49d670371b0d9ceab9abd9fdb3aca823127e..b619b38bab8028e169b7d6023566fde032b973bb 100644 (file)
--- a/fs/smb/client/smb2pdu.c
+++ b/fs/smb/client/smb2pdu.c
@@ -5683,7 +5683,7 @@ SMB2_set_eof(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,
 int
 SMB2_set_acl(const unsigned int xid, struct cifs_tcon *tcon,
                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,
                        current->tgid, 0, SMB2_O_INFO_SECURITY, aclflag,

diff --git a/fs/smb/client/smb2proto.h b/fs/smb/client/smb2proto.h
index b208232b12a24da69908d8f66085dac0b0d5d085..c7e1b149877a044df8a47569966dc34c59c183f3 100644 (file)
--- a/fs/smb/client/smb2proto.h
+++ b/fs/smb/client/smb2proto.h
@@ -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 int SMB2_set_acl(const unsigned int xid, struct cifs_tcon *tcon,
                        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,
                       u64 persistent_fid, u64 volatile_fid,
                       struct smb2_file_full_ea_info *buf, int len);

diff --git a/fs/smb/client/xattr.c b/fs/smb/client/xattr.c
index 6780aa3e98a1949d3996a2bc873e6d460d00149b..58a584f0b27e9150c9a882fc3438a2aa34b5bf1d 100644 (file)
--- a/fs/smb/client/xattr.c
+++ b/fs/smb/client/xattr.c
@@ -162,7 +162,7 @@ static int cifs_xattr_set(const struct xattr_handler *handler,
        case XATTR_CIFS_ACL:
        case XATTR_CIFS_NTSD:
        case XATTR_CIFS_NTSD_FULL: {
-               struct cifs_ntsd *pacl;
+               struct smb_ntsd *pacl;
 
                if (!value)
                        goto out;
@@ -315,7 +315,7 @@ static int cifs_xattr_get(const struct xattr_handler *handler,
                 * fetch owner and DACL otherwise
                 */
                u32 acllen, extra_info;
-               struct cifs_ntsd *pacl;
+               struct smb_ntsd *pacl;
 
                if (pTcon->ses->server->ops->get_acl == NULL)
                        goto out; /* rc already EOPNOTSUPP */