summaryrefslogtreecommitdiff
path: root/fs/cifs/smb2inode.c
diff options
context:
space:
mode:
authorRonnie Sahlberg <lsahlber@redhat.com>2021-03-09 09:07:28 +1000
committerSteve French <stfrench@microsoft.com>2021-04-25 16:28:23 -0500
commite6eb19504e23607816cd4df35e2633aef2540e96 (patch)
treef299a932f56122032f7857c85b6c9dcd4e57aa5c /fs/cifs/smb2inode.c
parent4df3d976dda2466799929b021d4e233639711d41 (diff)
cifs: pass a path to open_shroot and check if it is the root or not
Move the check for the directory path into the open_shroot() function but still fail for any non-root directories. This is preparation for later when we will start using the cache also for other directories than the root. 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.c22
1 files changed, 10 insertions, 12 deletions
diff --git a/fs/cifs/smb2inode.c b/fs/cifs/smb2inode.c
index 4b053dfcd428..f5b4cb712fe8 100644
--- a/fs/cifs/smb2inode.c
+++ b/fs/cifs/smb2inode.c
@@ -524,22 +524,20 @@ 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)) {
- rc = open_shroot(xid, tcon, cifs_sb, &cfid);
- if (!rc) {
- if (tcon->crfid.file_all_info_is_valid) {
- move_smb2_info_to_cifs(data,
+ rc = open_shroot(xid, tcon, full_path, cifs_sb, &cfid);
+ 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);
- }
- close_shroot(cfid);
- goto out;
+ if (!rc)
+ move_smb2_info_to_cifs(data, smb2_data);
}
+ close_shroot(cfid);
+ goto out;
}
cifs_get_readable_path(tcon, full_path, &cfile);