summaryrefslogtreecommitdiffstats
path: root/fs/cifs
diff options
context:
space:
mode:
authorRonnie Sahlberg <lsahlber@redhat.com>2021-03-09 00:07:28 +0100
committerSteve French <stfrench@microsoft.com>2021-04-25 23:28:23 +0200
commite6eb19504e23607816cd4df35e2633aef2540e96 (patch)
treef299a932f56122032f7857c85b6c9dcd4e57aa5c /fs/cifs
parentcifs: move the check for nohandlecache into open_shroot (diff)
downloadlinux-e6eb19504e23607816cd4df35e2633aef2540e96.tar.xz
linux-e6eb19504e23607816cd4df35e2633aef2540e96.zip
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')
-rw-r--r--fs/cifs/smb2inode.c22
-rw-r--r--fs/cifs/smb2ops.c6
-rw-r--r--fs/cifs/smb2proto.h1
3 files changed, 16 insertions, 13 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);
diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index 079d5027cf75..0a139cffbf29 100644
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -728,6 +728,7 @@ smb2_cached_lease_break(struct work_struct *work)
* Open the directory at the root of a share
*/
int open_shroot(unsigned int xid, struct cifs_tcon *tcon,
+ const char *path,
struct cifs_sb_info *cifs_sb,
struct cached_fid **cfid)
{
@@ -749,6 +750,9 @@ int open_shroot(unsigned int xid, struct cifs_tcon *tcon,
if (tcon->nohandlecache)
return -ENOTSUPP;
+ if (strlen(path))
+ return -ENOTSUPP;
+
mutex_lock(&tcon->crfid.fid_mutex);
if (tcon->crfid.is_valid) {
cifs_dbg(FYI, "found a cached root file handle\n");
@@ -926,7 +930,7 @@ smb3_qfs_tcon(const unsigned int xid, struct cifs_tcon *tcon,
oparms.fid = &fid;
oparms.reconnect = false;
- rc = open_shroot(xid, tcon, cifs_sb, &cfid);
+ rc = open_shroot(xid, tcon, "", cifs_sb, &cfid);
if (rc == 0)
memcpy(&fid, cfid->fid, sizeof(struct cifs_fid));
else
diff --git a/fs/cifs/smb2proto.h b/fs/cifs/smb2proto.h
index a2eb34a8d9c9..ceb46f099e33 100644
--- a/fs/cifs/smb2proto.h
+++ b/fs/cifs/smb2proto.h
@@ -70,6 +70,7 @@ extern int smb3_handle_read_data(struct TCP_Server_Info *server,
struct mid_q_entry *mid);
extern int open_shroot(unsigned int xid, struct cifs_tcon *tcon,
+ const char *path,
struct cifs_sb_info *cifs_sb,
struct cached_fid **cfid);
extern void close_shroot(struct cached_fid *cfid);