Skip to content

Commit

Permalink
cifs: store a pointer to the root dentry in cifs_sb_info once we have…
Browse files Browse the repository at this point in the history
… completed mounting the share

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>
Signed-off-by: Steve French <stfrench@microsoft.com>
  • Loading branch information
Ronnie Sahlberg authored and Steve French committed Apr 25, 2021
1 parent 45c0f1a commit 269f67e
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 1 deletion.
4 changes: 4 additions & 0 deletions fs/cifs/cifs_fs_sb.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
9 changes: 9 additions & 0 deletions fs/cifs/cifsfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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;

Expand Down
5 changes: 4 additions & 1 deletion fs/cifs/smb2ops.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 269f67e

Please sign in to comment.