From: Ronnie Sahlberg <lsahlber@redhat.com>
To: linux-cifs <linux-cifs@vger.kernel.org>
Cc: Steve French <smfrench@gmail.com>
Subject: [PATCH 1/9] cifs: move the check for nohandlecache into open_shroot
Date: Tue, 9 Mar 2021 09:07:27 +1000 [thread overview]
Message-ID: <20210308230735.337-2-lsahlber@redhat.com> (raw)
In-Reply-To: <20210308230735.337-1-lsahlber@redhat.com>
instead of doing it in the callsites for open_shroot.
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
---
fs/cifs/smb2inode.c | 24 +++++++++++-------------
fs/cifs/smb2ops.c | 16 ++++++++--------
2 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/fs/cifs/smb2inode.c b/fs/cifs/smb2inode.c
index 1f900b81c34a..3d59614cbe8f 100644
--- a/fs/cifs/smb2inode.c
+++ b/fs/cifs/smb2inode.c
@@ -511,7 +511,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;
@@ -524,23 +523,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);
diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index f5087295424c..7ee6926153b8 100644
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -746,6 +746,9 @@ int open_shroot(unsigned int xid, struct cifs_tcon *tcon,
u8 oplock = SMB2_OPLOCK_LEVEL_II;
struct cifs_fid *pfid;
+ if (tcon->nohandlecache)
+ return -ENOTSUPP;
+
mutex_lock(&tcon->crfid.fid_mutex);
if (tcon->crfid.is_valid) {
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;
struct cifs_open_parms oparms;
struct cifs_fid fid;
- bool no_cached_open = tcon->nohandlecache;
struct cached_fid *cfid = NULL;
oparms.tcon = tcon;
@@ -924,14 +926,12 @@ smb3_qfs_tcon(const unsigned int xid, struct cifs_tcon *tcon,
oparms.fid = &fid;
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,
NULL, NULL);
- } else {
- rc = open_shroot(xid, tcon, cifs_sb, &cfid);
- if (rc == 0)
- memcpy(&fid, cfid->fid, sizeof(struct cifs_fid));
- }
if (rc)
return;
@@ -945,7 +945,7 @@ smb3_qfs_tcon(const unsigned int xid, struct cifs_tcon *tcon,
FS_VOLUME_INFORMATION);
SMB2_QFS_attr(xid, tcon, fid.persistent_fid, fid.volatile_fid,
FS_SECTOR_SIZE_INFORMATION); /* SMB3 specific */
- if (no_cached_open)
+ if (cfid == NULL)
SMB2_close(xid, tcon, fid.persistent_fid, fid.volatile_fid);
else
close_shroot(cfid);
--
2.13.6
next parent reply other threads:[~2021-03-08 23:08 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20210308230735.337-1-lsahlber@redhat.com>
2021-03-08 23:07 ` Ronnie Sahlberg [this message]
2021-04-09 4:42 ` [PATCH 1/9] cifs: move the check for nohandlecache into open_shroot Steve French
2021-04-10 0:05 ` Steve French
2021-03-08 23:07 ` [PATCH 2/9] cifs: pass a path to open_shroot and check if it is the root or not Ronnie Sahlberg
2021-04-10 0:08 ` Steve French
2021-03-08 23:07 ` [PATCH 3/9] cifs: rename the *_shroot* functions to *_cached_dir* Ronnie Sahlberg
2021-04-10 0:10 ` Steve French
2021-03-08 23:07 ` [PATCH 4/9] cifs: store a pointer to the root dentry in cifs_sb_info once we have completed mounting the share Ronnie Sahlberg
2021-04-10 0:57 ` Steve French
2021-03-08 23:07 ` [PATCH 5/9] cifs: Grab a reference for the dentry of the cached directory during the lifetime of the cache Ronnie Sahlberg
2021-03-08 23:07 ` [PATCH 6/9] cifs: add a function to get a cached dir based on its dentry Ronnie Sahlberg
2021-03-08 23:07 ` [PATCH 7/9] cifs: add a timestamp to track when the lease of the cached dir was taken Ronnie Sahlberg
2021-03-08 23:07 ` [PATCH 8/9] cifs: pass the dentry instead of the inode down to the revalidation check functions Ronnie Sahlberg
2021-03-08 23:07 ` [PATCH 9/9] cifs: check the timestamp for the cached dirent when deciding on revalidate Ronnie Sahlberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210308230735.337-2-lsahlber@redhat.com \
--to=lsahlber@redhat.com \
--cc=linux-cifs@vger.kernel.org \
--cc=smfrench@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox