bundle up Unix SET_PATH_INFO args into a struct and change name

We'd like to be able to use the unix SET_PATH_INFO_BASIC args to set
file times as well, but that makes the argument list rather long. Bundle
up the args for unix SET_PATH_INFO call into a struct. For now, we don't
actually use the times fields anywhere. That will be done in a follow-on
patch.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>

1 files changed, 32 insertions, 22 deletions

diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 0e5dccc2f79a..024846719f1f 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -986,23 +986,24 @@ mkdir_get_info:
                                 direntry->d_inode->i_nlink = 2;
                 mode &= ~current->fs->umask;
                 if (pTcon->unix_ext) {
+                        struct cifs_unix_set_info_args args = {
+                                .mode   = mode,
+                                .ctime  = NO_CHANGE_64,
+                                .atime  = NO_CHANGE_64,
+                                .mtime  = NO_CHANGE_64,
+                                .device = 0,
+                        };
                         if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID) {
-                                CIFSSMBUnixSetPerms(xid, pTcon, full_path,
-                                                    mode,
-                                                    (__u64)current->fsuid,
-                                                    (__u64)current->fsgid,
-                                                    0 /* dev_t */,
-                                                    cifs_sb->local_nls,
-                                                    cifs_sb->mnt_cifs_flags &
-                                                    CIFS_MOUNT_MAP_SPECIAL_CHR);
+                                args.uid = (__u64)current->fsuid;
+                                args.gid = (__u64)current->fsgid;
                         } else {
-                                CIFSSMBUnixSetPerms(xid, pTcon, full_path,
-                                                    mode, (__u64)-1,
-                                                    (__u64)-1, 0 /* dev_t */,
-                                                    cifs_sb->local_nls,
-                                                    cifs_sb->mnt_cifs_flags &
-                                                    CIFS_MOUNT_MAP_SPECIAL_CHR);
+                                args.uid = NO_CHANGE_64;
+                                args.gid = NO_CHANGE_64;
                         }
+                        CIFSSMBUnixSetInfo(xid, pTcon, full_path, &args,
+                                            cifs_sb->local_nls,
+                                            cifs_sb->mnt_cifs_flags &
+                                            CIFS_MOUNT_MAP_SPECIAL_CHR);
                 } else {
                         if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) &&
                             (mode & S_IWUGO) == 0) {
@@ -1500,9 +1501,9 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs)
         FILE_BASIC_INFO time_buf;
         bool set_time = false;
         bool set_dosattr = false;
-        __u64 mode = 0xFFFFFFFFFFFFFFFFULL;
-        __u64 uid = 0xFFFFFFFFFFFFFFFFULL;
-        __u64 gid = 0xFFFFFFFFFFFFFFFFULL;
+        __u64 mode = NO_CHANGE_64;
+        __u64 uid = NO_CHANGE_64;
+        __u64 gid = NO_CHANGE_64;
         struct cifsInodeInfo *cifsInode;
         struct inode *inode = direntry->d_inode;
 
@@ -1586,12 +1587,21 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs)
         }
 
         if ((pTcon->unix_ext)
-            && (attrs->ia_valid & (ATTR_MODE | ATTR_GID | ATTR_UID)))
-                rc = CIFSSMBUnixSetPerms(xid, pTcon, full_path, mode, uid, gid,
-                                         0 /* dev_t */, cifs_sb->local_nls,
-                                         cifs_sb->mnt_cifs_flags &
+            && (attrs->ia_valid & (ATTR_MODE | ATTR_GID | ATTR_UID))) {
+                struct cifs_unix_set_info_args args = {
+                        .mode   = mode,
+                        .uid    = uid,
+                        .gid    = gid,
+                        .ctime  = NO_CHANGE_64,
+                        .atime  = NO_CHANGE_64,
+                        .mtime  = NO_CHANGE_64,
+                        .device = 0,
+                };
+                rc = CIFSSMBUnixSetInfo(xid, pTcon, full_path, &args,
+                                        cifs_sb->local_nls,
+                                        cifs_sb->mnt_cifs_flags &
                                                 CIFS_MOUNT_MAP_SPECIAL_CHR);
-        else if (attrs->ia_valid & ATTR_MODE) {
+        } else if (attrs->ia_valid & ATTR_MODE) {
                 rc = 0;
 #ifdef CONFIG_CIFS_EXPERIMENTAL
                 if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL)