summaryrefslogtreecommitdiff
path: root/fs/cifs/smb2inode.c
diff options
context:
space:
mode:
authorRonnie Sahlberg <lsahlber@redhat.com>2021-03-09 02:07:27 +0300
committerSteve French <stfrench@microsoft.com>2021-04-26 00:28:23 +0300
commit4df3d976dda2466799929b021d4e233639711d41 (patch)
tree60cd75d97d32e3b4516ba684959f34aaed4a5b9d /fs/cifs/smb2inode.c
parent991e72eb0e99764219865b9a3a07328695148e14 (diff)
downloadlinux-4df3d976dda2466799929b021d4e233639711d41.tar.xz
cifs: move the check for nohandlecache into open_shroot
instead of doing it in the callsites for open_shroot. Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com> Signed-off-by: Steve French <stfrench@microsoft.com>
Diffstat (limited to 'fs/cifs/smb2inode.c')
-rw-r--r--fs/cifs/smb2inode.c24
1 files changed, 11 insertions, 13 deletions
diff --git a/fs/cifs/smb2inode.c b/fs/cifs/smb2inode.c
index a718dc77e604..4b053dfcd428 100644
--- a/fs/cifs/smb2inode.c
+++ b/fs/cifs/smb2inode.c
@@ -512,7 +512,6 @@ smb2_query_path_info(const unsigned int xid, struct cifs_tcon *tcon,
int rc;
struct smb2_file_all_info *smb2_data;
__u32 create_options = 0;
- bool no_cached_open = tcon->nohandlecache;
struct cifsFileInfo *cfile;
struct cached_fid *cfid = NULL;
@@ -525,23 +524,22 @@ smb2_query_path_info(const unsigned int xid, struct cifs_tcon *tcon,
return -ENOMEM;
/* If it is a root and its handle is cached then use it */
- if (!strlen(full_path) && !no_cached_open) {
+ if (!strlen(full_path)) {
rc = open_shroot(xid, tcon, cifs_sb, &cfid);
- if (rc)
- goto out;
-
- if (tcon->crfid.file_all_info_is_valid) {
- move_smb2_info_to_cifs(data,
+ if (!rc) {
+ if (tcon->crfid.file_all_info_is_valid) {
+ move_smb2_info_to_cifs(data,
&tcon->crfid.file_all_info);
- } else {
- rc = SMB2_query_info(xid, tcon,
+ } else {
+ rc = SMB2_query_info(xid, tcon,
cfid->fid->persistent_fid,
cfid->fid->volatile_fid, smb2_data);
- if (!rc)
- move_smb2_info_to_cifs(data, smb2_data);
+ if (!rc)
+ move_smb2_info_to_cifs(data, smb2_data);
+ }
+ close_shroot(cfid);
+ goto out;
}
- close_shroot(cfid);
- goto out;
}
cifs_get_readable_path(tcon, full_path, &cfile);