From: Ronnie Sahlberg <lsahlber@redhat.com>
To: linux-cifs <linux-cifs@vger.kernel.org>
Cc: Steve French <smfrench@gmail.com>
Subject: [PATCH 4/9] cifs: store a pointer to the root dentry in cifs_sb_info once we have completed mounting the share
Date: Tue, 9 Mar 2021 09:07:30 +1000 [thread overview]
Message-ID: <20210308230735.337-5-lsahlber@redhat.com> (raw)
In-Reply-To: <20210308230735.337-1-lsahlber@redhat.com>
And use this to only allow to take out a shared handle once the mount has completed and the
sb becomes available.
This will become important in follow up patches where we will start holding a reference to the
directory dentry for the shared handle during the lifetime of the handle.
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
---
fs/cifs/cifs_fs_sb.h | 4 ++++
fs/cifs/cifsfs.c | 9 +++++++++
fs/cifs/smb2ops.c | 5 ++++-
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/fs/cifs/cifs_fs_sb.h b/fs/cifs/cifs_fs_sb.h
index aa77edc12212..2a5325a7ae49 100644
--- a/fs/cifs/cifs_fs_sb.h
+++ b/fs/cifs/cifs_fs_sb.h
@@ -81,5 +81,9 @@ struct cifs_sb_info {
* (cifs_autodisable_serverino) in order to match new mounts.
*/
bool mnt_cifs_serverino_autodisabled;
+ /*
+ * Available once the mount has completed.
+ */
+ struct dentry *root;
};
#endif /* _CIFS_FS_SB_H */
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 3b61f09f3e1b..c075ef1dd755 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -257,6 +257,12 @@ cifs_read_super(struct super_block *sb)
static void cifs_kill_sb(struct super_block *sb)
{
struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
+
+ if (cifs_sb->root) {
+ dput(cifs_sb->root);
+ cifs_sb->root = NULL;
+ }
+
kill_anon_super(sb);
cifs_umount(cifs_sb);
}
@@ -886,6 +892,9 @@ cifs_smb3_do_mount(struct file_system_type *fs_type,
if (IS_ERR(root))
goto out_super;
+ if (cifs_sb)
+ cifs_sb->root = dget(root);
+
cifs_dbg(FYI, "dentry root is: %p\n", root);
return root;
diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index d2858c25ff17..7f4da573b9e8 100644
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -751,8 +751,11 @@ int open_cached_dir(unsigned int xid, struct cifs_tcon *tcon,
if (tcon->nohandlecache)
return -ENOTSUPP;
+ if (cifs_sb->root == NULL)
+ return -ENOENT;
+
if (strlen(path))
- return -ENOTSUPP;
+ return -ENOENT;
mutex_lock(&tcon->crfid.fid_mutex);
if (tcon->crfid.is_valid) {
--
2.13.6
next prev 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 ` [PATCH 1/9] cifs: move the check for nohandlecache into open_shroot Ronnie Sahlberg
2021-04-09 4:42 ` 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 ` Ronnie Sahlberg [this message]
2021-04-10 0:57 ` [PATCH 4/9] cifs: store a pointer to the root dentry in cifs_sb_info once we have completed mounting the share 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-5-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