Merge tag 'dma-mapping-5.6' of git://git.infradead.org/users/hch/dma-mapping

[linux.git] / fs / cifs / smb2inode.c

diff --git a/fs/cifs/smb2inode.c b/fs/cifs/smb2inode.c
index 5ef5e97a6d13eb8171c5b49ce2f02096dc18a391..1cf207564ff9676b6901e951a812267380effe10 100644 (file)
--- a/fs/cifs/smb2inode.c
+++ b/fs/cifs/smb2inode.c
@@ -99,9 +99,7 @@ smb2_compound_op(const unsigned int xid, struct cifs_tcon *tcon,
        oparms.tcon = tcon;
        oparms.desired_access = desired_access;
        oparms.disposition = create_disposition;
-       oparms.create_options = create_options;
-       if (backup_cred(cifs_sb))
-               oparms.create_options |= CREATE_OPEN_BACKUP_INTENT;
+       oparms.create_options = cifs_create_options(cifs_sb, create_options);
        oparms.fid = &fid;
        oparms.reconnect = false;
        oparms.mode = mode;
@@ -457,7 +455,7 @@ smb2_query_path_info(const unsigned int xid, struct cifs_tcon *tcon,
 
        /* If it is a root and its handle is cached then use it */
        if (!strlen(full_path) && !no_cached_open) {
-               rc = open_shroot(xid, tcon, &fid);
+               rc = open_shroot(xid, tcon, cifs_sb, &fid);
                if (rc)
                        goto out;
 
@@ -474,9 +472,6 @@ smb2_query_path_info(const unsigned int xid, struct cifs_tcon *tcon,
                goto out;
        }
 
-       if (backup_cred(cifs_sb))
-               create_options |= CREATE_OPEN_BACKUP_INTENT;
-
        cifs_get_readable_path(tcon, full_path, &cfile);
        rc = smb2_compound_op(xid, tcon, cifs_sb, full_path,
                              FILE_READ_ATTRIBUTES, FILE_OPEN, create_options,