CIFS: Cleanup cifs open codepath

Rename CIFSSMBOpen to CIFS_open and make it take
cifs_open_parms structure as a parm.

Signed-off-by: Pavel Shilovsky <piastry@etersoft.ru>
Signed-off-by: Steve French <smfrench@gmail.com>

1 files changed, 43 insertions, 28 deletions

diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
index abd2cc9515c9..9ac5bfc9cc56 100644
--- a/fs/cifs/smb1ops.c
+++ b/fs/cifs/smb1ops.c
@@ -560,17 +560,24 @@ cifs_query_path_info(const unsigned int xid, struct cifs_tcon *tcon,
         if (!rc && (le32_to_cpu(data->Attributes) & ATTR_REPARSE)) {
                 int tmprc;
                 int oplock = 0;
-                __u16 netfid;
+                struct cifs_fid fid;
+                struct cifs_open_parms oparms;
+
+                oparms.tcon = tcon;
+                oparms.cifs_sb = cifs_sb;
+                oparms.desired_access = FILE_READ_ATTRIBUTES;
+                oparms.create_options = 0;
+                oparms.disposition = FILE_OPEN;
+                oparms.path = full_path;
+                oparms.fid = &fid;
+                oparms.reconnect = false;
 
                 /* Need to check if this is a symbolic link or not */
-                tmprc = CIFSSMBOpen(xid, tcon, full_path, FILE_OPEN,
-                                    FILE_READ_ATTRIBUTES, 0, &netfid, &oplock,
-                                    NULL, cifs_sb->local_nls,
-                        cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);
+                tmprc = CIFS_open(xid, &oparms, &oplock, NULL);
                 if (tmprc == -EOPNOTSUPP)
                         *symlink = true;
                 else
-                        CIFSSMBClose(xid, tcon, netfid);
+                        CIFSSMBClose(xid, tcon, fid.netfid);
         }
 
         return rc;
@@ -705,12 +712,7 @@ cifs_open_file(const unsigned int xid, struct cifs_open_parms *oparms,
                                      oparms->cifs_sb->local_nls,
                                      oparms->cifs_sb->mnt_cifs_flags
                                                 & CIFS_MOUNT_MAP_SPECIAL_CHR);
-        return CIFSSMBOpen(xid, oparms->tcon, oparms->path,
-                           oparms->disposition, oparms->desired_access,
-                           oparms->create_options, &oparms->fid->netfid, oplock,
-                           buf, oparms->cifs_sb->local_nls,
-                           oparms->cifs_sb->mnt_cifs_flags &
-                                                CIFS_MOUNT_MAP_SPECIAL_CHR);
+        return CIFS_open(xid, oparms, oplock, buf);
 }
 
 static void
@@ -761,8 +763,9 @@ smb_set_file_info(struct inode *inode, const char *full_path,
 {
         int oplock = 0;
         int rc;
-        __u16 netfid;
         __u32 netpid;
+        struct cifs_fid fid;
+        struct cifs_open_parms oparms;
         struct cifsFileInfo *open_file;
         struct cifsInodeInfo *cinode = CIFS_I(inode);
         struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
@@ -772,7 +775,7 @@ smb_set_file_info(struct inode *inode, const char *full_path,
         /* if the file is already open for write, just use that fileid */
         open_file = find_writable_file(cinode, true);
         if (open_file) {
-                netfid = open_file->fid.netfid;
+                fid.netfid = open_file->fid.netfid;
                 netpid = open_file->pid;
                 tcon = tlink_tcon(open_file->tlink);
                 goto set_via_filehandle;
@@ -796,12 +799,17 @@ smb_set_file_info(struct inode *inode, const char *full_path,
                 goto out;
         }
 
-        cifs_dbg(FYI, "calling SetFileInfo since SetPathInfo for times not supported by this server\n");
-        rc = CIFSSMBOpen(xid, tcon, full_path, FILE_OPEN,
-                         SYNCHRONIZE | FILE_WRITE_ATTRIBUTES, CREATE_NOT_DIR,
-                         &netfid, &oplock, NULL, cifs_sb->local_nls,
-                         cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);
+        oparms.tcon = tcon;
+        oparms.cifs_sb = cifs_sb;
+        oparms.desired_access = SYNCHRONIZE | FILE_WRITE_ATTRIBUTES;
+        oparms.create_options = CREATE_NOT_DIR;
+        oparms.disposition = FILE_OPEN;
+        oparms.path = full_path;
+        oparms.fid = &fid;
+        oparms.reconnect = false;
 
+        cifs_dbg(FYI, "calling SetFileInfo since SetPathInfo for times not supported by this server\n");
+        rc = CIFS_open(xid, &oparms, &oplock, NULL);
         if (rc != 0) {
                 if (rc == -EIO)
                         rc = -EINVAL;
@@ -811,12 +819,12 @@ smb_set_file_info(struct inode *inode, const char *full_path,
         netpid = current->tgid;
 
 set_via_filehandle:
-        rc = CIFSSMBSetFileInfo(xid, tcon, buf, netfid, netpid);
+        rc = CIFSSMBSetFileInfo(xid, tcon, buf, fid.netfid, netpid);
         if (!rc)
                 cinode->cifsAttrs = le32_to_cpu(buf->Attributes);
 
         if (open_file == NULL)
-                CIFSSMBClose(xid, tcon, netfid);
+                CIFSSMBClose(xid, tcon, fid.netfid);
         else
                 cifsFileInfo_put(open_file);
 out:
@@ -941,7 +949,8 @@ cifs_query_symlink(const unsigned int xid, struct cifs_tcon *tcon,
 {
         int rc;
         int oplock = 0;
-        __u16 netfid;
+        struct cifs_fid fid;
+        struct cifs_open_parms oparms;
 
         cifs_dbg(FYI, "%s: path: %s\n", __func__, full_path);
 
@@ -957,21 +966,27 @@ cifs_query_symlink(const unsigned int xid, struct cifs_tcon *tcon,
                 goto out;
         }
 
-        rc = CIFSSMBOpen(xid, tcon, full_path, FILE_OPEN,
-                         FILE_READ_ATTRIBUTES, OPEN_REPARSE_POINT, &netfid,
-                         &oplock, NULL, cifs_sb->local_nls,
-                         cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);
+        oparms.tcon = tcon;
+        oparms.cifs_sb = cifs_sb;
+        oparms.desired_access = FILE_READ_ATTRIBUTES;
+        oparms.create_options = OPEN_REPARSE_POINT;
+        oparms.disposition = FILE_OPEN;
+        oparms.path = full_path;
+        oparms.fid = &fid;
+        oparms.reconnect = false;
+
+        rc = CIFS_open(xid, &oparms, &oplock, NULL);
         if (rc)
                 goto out;
 
-        rc = CIFSSMBQuerySymLink(xid, tcon, netfid, target_path,
+        rc = CIFSSMBQuerySymLink(xid, tcon, fid.netfid, target_path,
                                  cifs_sb->local_nls);
         if (rc)
                 goto out_close;
 
         convert_delimiter(*target_path, '/');
 out_close:
-        CIFSSMBClose(xid, tcon, netfid);
+        CIFSSMBClose(xid, tcon, fid.netfid);
 out:
         if (!rc)
                 cifs_dbg(FYI, "%s: target path: %s\n", __func__, *target_path);