Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-17 02:36:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cifs: move the check for nohandlecache into open_shroot

Browse Source 
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>
This commit is contained in:
Ronnie Sahlberg 2021-03-09 09:07:27 +10:00 committed by Steve French
parent 991e72eb0e
commit 4df3d976dd
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fs/cifs/smb2inode.c
View File

@ -512,7 +512,6 @@ smb2_query_path_info(const unsigned int xid, struct cifs_tcon *tcon,
int rc; int rc;
struct smb2_file_all_info *smb2_data; struct smb2_file_all_info *smb2_data;
__u32 create_options = 0; __u32 create_options = 0;
bool no_cached_open = tcon->nohandlecache;
struct cifsFileInfo *cfile; struct cifsFileInfo *cfile;
struct cached_fid *cfid = NULL; struct cached_fid *cfid = NULL;
@ -525,23 +524,22 @@ smb2_query_path_info(const unsigned int xid, struct cifs_tcon *tcon,
return -ENOMEM; return -ENOMEM;
/* If it is a root and its handle is cached then use it */ /* 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); rc = open_shroot(xid, tcon, cifs_sb, &cfid);
if (rc) if (!rc) {
goto out; if (tcon->crfid.file_all_info_is_valid) {
move_smb2_info_to_cifs(data,
if (tcon->crfid.file_all_info_is_valid) {
move_smb2_info_to_cifs(data,
&tcon->crfid.file_all_info); &tcon->crfid.file_all_info);
} else { } else {
rc = SMB2_query_info(xid, tcon, rc = SMB2_query_info(xid, tcon,
cfid->fid->persistent_fid, cfid->fid->persistent_fid,
cfid->fid->volatile_fid, smb2_data); cfid->fid->volatile_fid, smb2_data);
if (!rc) if (!rc)
move_smb2_info_to_cifs(data, smb2_data); 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); cifs_get_readable_path(tcon, full_path, &cfile);

16
fs/cifs/smb2ops.c
View File

@ -746,6 +746,9 @@ int open_shroot(unsigned int xid, struct cifs_tcon *tcon,
u8 oplock = SMB2_OPLOCK_LEVEL_II; u8 oplock = SMB2_OPLOCK_LEVEL_II;
struct cifs_fid *pfid; struct cifs_fid *pfid;
if (tcon->nohandlecache)
return -ENOTSUPP;
mutex_lock(&tcon->crfid.fid_mutex); mutex_lock(&tcon->crfid.fid_mutex);
if (tcon->crfid.is_valid) { if (tcon->crfid.is_valid) {
cifs_dbg(FYI, "found a cached root file handle\n"); cifs_dbg(FYI, "found a cached root file handle\n");
@ -914,7 +917,6 @@ smb3_qfs_tcon(const unsigned int xid, struct cifs_tcon *tcon,
u8 oplock = SMB2_OPLOCK_LEVEL_NONE; u8 oplock = SMB2_OPLOCK_LEVEL_NONE;
struct cifs_open_parms oparms; struct cifs_open_parms oparms;
struct cifs_fid fid; struct cifs_fid fid;
bool no_cached_open = tcon->nohandlecache;
struct cached_fid *cfid = NULL; struct cached_fid *cfid = NULL;
oparms.tcon = tcon; oparms.tcon = tcon;
@ -924,14 +926,12 @@ smb3_qfs_tcon(const unsigned int xid, struct cifs_tcon *tcon,
oparms.fid = &fid; oparms.fid = &fid;
oparms.reconnect = false; oparms.reconnect = false;
if (no_cached_open) { rc = open_shroot(xid, tcon, cifs_sb, &cfid);
if (rc == 0)
memcpy(&fid, cfid->fid, sizeof(struct cifs_fid));
else
rc = SMB2_open(xid, &oparms, &srch_path, &oplock, NULL, NULL, rc = SMB2_open(xid, &oparms, &srch_path, &oplock, NULL, NULL,
NULL, NULL); NULL, NULL);
} else {
rc = open_shroot(xid, tcon, cifs_sb, &cfid);
if (rc == 0)
memcpy(&fid, cfid->fid, sizeof(struct cifs_fid));
}
if (rc) if (rc)
return; return;
@ -945,7 +945,7 @@ smb3_qfs_tcon(const unsigned int xid, struct cifs_tcon *tcon,
FS_VOLUME_INFORMATION); FS_VOLUME_INFORMATION);
SMB2_QFS_attr(xid, tcon, fid.persistent_fid, fid.volatile_fid, SMB2_QFS_attr(xid, tcon, fid.persistent_fid, fid.volatile_fid,
FS_SECTOR_SIZE_INFORMATION); /* SMB3 specific */ FS_SECTOR_SIZE_INFORMATION); /* SMB3 specific */
if (no_cached_open) if (cfid == NULL)
SMB2_close(xid, tcon, fid.persistent_fid, fid.volatile_fid); SMB2_close(xid, tcon, fid.persistent_fid, fid.volatile_fid);
else else
close_shroot(cfid); close_shroot(cfid);