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, 28 insertions, 12 deletions

diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c
index 51f5e0ee7237..8f9b4f710d4a 100644
--- a/fs/cifs/cifsacl.c
+++ b/fs/cifs/cifsacl.c
@@ -895,9 +895,10 @@ static struct cifs_ntsd *get_cifs_acl_by_path(struct cifs_sb_info *cifs_sb,
         int oplock = 0;
         unsigned int xid;
         int rc, create_options = 0;
-        __u16 fid;
         struct cifs_tcon *tcon;
         struct tcon_link *tlink = cifs_sb_tlink(cifs_sb);
+        struct cifs_fid fid;
+        struct cifs_open_parms oparms;
 
         if (IS_ERR(tlink))
                 return ERR_CAST(tlink);
@@ -908,12 +909,19 @@ static struct cifs_ntsd *get_cifs_acl_by_path(struct cifs_sb_info *cifs_sb,
         if (backup_cred(cifs_sb))
                 create_options |= CREATE_OPEN_BACKUP_INTENT;
 
-        rc = CIFSSMBOpen(xid, tcon, path, FILE_OPEN, READ_CONTROL,
-                        create_options, &fid, &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 = READ_CONTROL;
+        oparms.create_options = create_options;
+        oparms.disposition = FILE_OPEN;
+        oparms.path = path;
+        oparms.fid = &fid;
+        oparms.reconnect = false;
+
+        rc = CIFS_open(xid, &oparms, &oplock, NULL);
         if (!rc) {
-                rc = CIFSSMBGetCIFSACL(xid, tcon, fid, &pntsd, pacllen);
-                CIFSSMBClose(xid, tcon, fid);
+                rc = CIFSSMBGetCIFSACL(xid, tcon, fid.netfid, &pntsd, pacllen);
+                CIFSSMBClose(xid, tcon, fid.netfid);
         }
 
         cifs_put_tlink(tlink);
@@ -950,10 +958,11 @@ int set_cifs_acl(struct cifs_ntsd *pnntsd, __u32 acllen,
         int oplock = 0;
         unsigned int xid;
         int rc, access_flags, create_options = 0;
-        __u16 fid;
         struct cifs_tcon *tcon;
         struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
         struct tcon_link *tlink = cifs_sb_tlink(cifs_sb);
+        struct cifs_fid fid;
+        struct cifs_open_parms oparms;
 
         if (IS_ERR(tlink))
                 return PTR_ERR(tlink);
@@ -969,18 +978,25 @@ int set_cifs_acl(struct cifs_ntsd *pnntsd, __u32 acllen,
         else
                 access_flags = WRITE_DAC;
 
-        rc = CIFSSMBOpen(xid, tcon, path, FILE_OPEN, access_flags,
-                        create_options, &fid, &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 = access_flags;
+        oparms.create_options = create_options;
+        oparms.disposition = FILE_OPEN;
+        oparms.path = path;
+        oparms.fid = &fid;
+        oparms.reconnect = false;
+
+        rc = CIFS_open(xid, &oparms, &oplock, NULL);
         if (rc) {
                 cifs_dbg(VFS, "Unable to open file to set ACL\n");
                 goto out;
         }
 
-        rc = CIFSSMBSetCIFSACL(xid, tcon, fid, pnntsd, acllen, aclflag);
+        rc = CIFSSMBSetCIFSACL(xid, tcon, fid.netfid, pnntsd, acllen, aclflag);
         cifs_dbg(NOISY, "SetCIFSACL rc = %d\n", rc);
 
-        CIFSSMBClose(xid, tcon, fid);
+        CIFSSMBClose(xid, tcon, fid.netfid);
 out:
         free_xid(xid);
         cifs_put_tlink(tlink);