smb: client: convert cifs_smb3_do_mount() to sget_fc()

The CIFS mount path already runs through fs_context: smb3_get_tree()
calls smb3_get_tree_common() with a struct fs_context * in hand. But
the fc is dropped on the way to sget(). Plumb it through to sget_fc()
so the legacy sget() interface can go.

cifs_smb3_do_mount() now takes (struct fs_context *, struct
smb3_fs_context *). The old (fs_type, flags) pair is reconstructed
from fc->fs_type and fc->sb_flags. The flags argument was always
passed as 0 by the sole caller anyway. The cifs_dbg diagnostic now
prints fc->sb_flags directly.

cifs_match_super() and cifs_set_super() were the two void-data
callbacks for sget(). The match callback now takes
(struct super_block *, struct fs_context *) and reads struct
cifs_mnt_data out of fc->sget_key. The set callback is gone entirely:
sget_fc() pre-populates sb->s_fs_info from fc->s_fs_info before
invoking set() so set_anon_super_fc() (which just allocates an anon
bdev) is sufficient.

Before sget_fc() we stash cifs_sb in fc->s_fs_info, the per-mount data
in fc->sget_key and force fc->sb_flags to SB_NODIRATIME | SB_NOATIME
to reproduce the previous hard-coded behaviour (alloc_super() reads
fc->sb_flags). The original sb_flags is saved and restored around the
call so the rest of the mount path sees the same fc semantics as
before.

mnt_data.flags keeps its historical value of 0 so the CIFS_MS_MASK
comparison in compare_mount_options() returns the same (always-equal)
result.

No functional change. With this in place sget() has no remaining CIFS
caller.

Link: https://patch.msgid.link/20260529-work-sget-v2-3-57bbe08604e4@kernel.org
Signed-off-by: Christian Brauner (Amutable) <brauner@kernel.org>

diff --git a/fs/smb/client/cifsfs.c b/fs/smb/client/cifsfs.c
index 9f76b0347fa9d71df496eb2584b92f0759931069..d5074e3fbb85da108cb1fab5b4a9bb58c9594341 100644 (file)
--- a/fs/smb/client/cifsfs.c
+++ b/fs/smb/client/cifsfs.c
@@ -12,6 +12,7 @@
 
 #include <linux/module.h>
 #include <linux/fs.h>
+#include <linux/fs_context.h>
 #include <linux/filelock.h>
 #include <linux/mount.h>
 #include <linux/slab.h>
@@ -966,26 +967,19 @@ cifs_get_root(struct smb3_fs_context *ctx, struct super_block *sb)
        return dentry;
 }
 
-static int cifs_set_super(struct super_block *sb, void *data)
-{
-       struct cifs_mnt_data *mnt_data = data;
-       sb->s_fs_info = mnt_data->cifs_sb;
-       return set_anon_super(sb, NULL);
-}
-
 struct dentry *
-cifs_smb3_do_mount(struct file_system_type *fs_type,
-             int flags, struct smb3_fs_context *old_ctx)
+cifs_smb3_do_mount(struct fs_context *fc, struct smb3_fs_context *old_ctx)
 {
        struct cifs_mnt_data mnt_data;
        struct cifs_sb_info *cifs_sb;
        struct super_block *sb;
        struct dentry *root;
+       unsigned int saved_sb_flags;
        int rc;
 
        if (cifsFYI) {
-               cifs_dbg(FYI, "%s: devname=%s flags=0x%x\n", __func__,
-                        old_ctx->source, flags);
+               cifs_dbg(FYI, "%s: devname=%s sb_flags=0x%x\n", __func__,
+                        old_ctx->source, fc->sb_flags);
        } else {
                cifs_info("Attempting to mount %s\n", old_ctx->source);
        }
@@ -1012,7 +1006,7 @@ cifs_smb3_do_mount(struct file_system_type *fs_type,
 
        rc = cifs_mount(cifs_sb, cifs_sb->ctx);
        if (rc) {
-               if (!(flags & SB_SILENT))
+               if (!(fc->sb_flags & SB_SILENT))
                        cifs_dbg(VFS, "cifs_mount failed w/return code = %d\n",
                                 rc);
                root = ERR_PTR(rc);
@@ -1021,12 +1015,27 @@ cifs_smb3_do_mount(struct file_system_type *fs_type,
 
        mnt_data.ctx = cifs_sb->ctx;
        mnt_data.cifs_sb = cifs_sb;
-       mnt_data.flags = flags;
+       mnt_data.flags = 0;
 
-       /* BB should we make this contingent on mount parm? */
-       flags |= SB_NODIRATIME | SB_NOATIME;
-
-       sb = sget(fs_type, cifs_match_super, cifs_set_super, flags, &mnt_data);
+       /*
+        * sb->s_flags is set from fc->sb_flags by alloc_super(). CIFS has
+        * historically forced SB_NODIRATIME | SB_NOATIME on every mount and
+        * ignored the caller-supplied SB_* flags. Preserve that behaviour by
+        * overriding fc->sb_flags around the sget_fc() call.
+        *
+        * Hand cifs_sb to sget_fc() via fc->s_fs_info; sget_fc() copies it
+        * onto sb->s_fs_info before running set() and clears fc->s_fs_info
+        * on successful publish. Pass the rest of the per-mount context to
+        * cifs_match_super() through fc->sget_key.
+        */
+       saved_sb_flags = fc->sb_flags;
+       fc->sb_flags = SB_NODIRATIME | SB_NOATIME;
+       fc->s_fs_info = cifs_sb;
+       fc->sget_key = &mnt_data;
+       sb = sget_fc(fc, cifs_match_super, set_anon_super_fc);
+       fc->sget_key = NULL;
+       fc->s_fs_info = NULL;
+       fc->sb_flags = saved_sb_flags;
        if (IS_ERR(sb)) {
                cifs_umount(cifs_sb);
                return ERR_CAST(sb);

diff --git a/fs/smb/client/cifsfs.h b/fs/smb/client/cifsfs.h
index c455b15f277821da870eac8866e7cd11946dff6e..0a93f48924a5a361b35b1f3b800b7966f702dc72 100644 (file)
--- a/fs/smb/client/cifsfs.h
+++ b/fs/smb/client/cifsfs.h
@@ -144,8 +144,9 @@ ssize_t cifs_file_copychunk_range(unsigned int xid, struct file *src_file,
 long cifs_ioctl(struct file *filep, unsigned int command, unsigned long arg);
 void cifs_setsize(struct inode *inode, loff_t offset);
 
+struct fs_context;
 struct smb3_fs_context;
-struct dentry *cifs_smb3_do_mount(struct file_system_type *fs_type, int flags,
+struct dentry *cifs_smb3_do_mount(struct fs_context *fc,
                                  struct smb3_fs_context *old_ctx);
 
 char *cifs_silly_fullpath(struct dentry *dentry);

diff --git a/fs/smb/client/cifsproto.h b/fs/smb/client/cifsproto.h
index 4a25afda9448a4e089df601586180473ae9fdb5d..a39572cbaadb207130a6e058f4ae8f9dc3798650 100644 (file)
--- a/fs/smb/client/cifsproto.h
+++ b/fs/smb/client/cifsproto.h
@@ -19,6 +19,7 @@
 struct statfs;
 struct smb_rqst;
 struct smb3_fs_context;
+struct fs_context;
 
 /*
  *****************************************************************
@@ -236,7 +237,7 @@ void cifs_mount_put_conns(struct cifs_mount_ctx *mnt_ctx);
 int cifs_mount_get_session(struct cifs_mount_ctx *mnt_ctx);
 int cifs_is_path_remote(struct cifs_mount_ctx *mnt_ctx);
 int cifs_mount_get_tcon(struct cifs_mount_ctx *mnt_ctx);
-int cifs_match_super(struct super_block *sb, void *data);
+int cifs_match_super(struct super_block *sb, struct fs_context *fc);
 int cifs_mount(struct cifs_sb_info *cifs_sb, struct smb3_fs_context *ctx);
 void cifs_umount(struct cifs_sb_info *cifs_sb);
 void cifs_mark_open_files_invalid(struct cifs_tcon *tcon);

diff --git a/fs/smb/client/connect.c b/fs/smb/client/connect.c
index dcde25da468dfb9fa3e89df5eb0bf5b420aa5480..79762e6bbe50caa274a932318cae43a0bfe8c272 100644 (file)
--- a/fs/smb/client/connect.c
+++ b/fs/smb/client/connect.c
@@ -6,6 +6,7 @@
  *
  */
 #include <linux/fs.h>
+#include <linux/fs_context.h>
 #include <linux/net.h>
 #include <linux/string.h>
 #include <linux/sched/mm.h>
@@ -2991,9 +2992,9 @@ static int match_prepath(struct super_block *sb,
 }
 
 int
-cifs_match_super(struct super_block *sb, void *data)
+cifs_match_super(struct super_block *sb, struct fs_context *fc)
 {
-       struct cifs_mnt_data *mnt_data = data;
+       struct cifs_mnt_data *mnt_data = fc->sget_key;
        struct smb3_fs_context *ctx;
        struct cifs_sb_info *cifs_sb;
        struct TCP_Server_Info *tcp_srv;

diff --git a/fs/smb/client/fs_context.c b/fs/smb/client/fs_context.c
index b9544eb0381b73e7fda357e7476fe481a1b1a375..6aba4e1c9c273684635aafe95b2b202fdc85a089 100644 (file)
--- a/fs/smb/client/fs_context.c
+++ b/fs/smb/client/fs_context.c
@@ -920,7 +920,7 @@ static int smb3_get_tree_common(struct fs_context *fc)
        struct dentry *root;
        int rc = 0;
 
-       root = cifs_smb3_do_mount(fc->fs_type, 0, ctx);
+       root = cifs_smb3_do_mount(fc, ctx);
        if (IS_ERR(root))
                return PTR_ERR(root);