devtmpfs regression fix: reconfigure on each mount

Prior to Linux v5.4 devtmpfs used mount_single() which treats the given
mount options as "remount" options, so it updates the configuration of
the single super_block on each mount.

Since that was changed, the mount options used for devtmpfs are ignored.
This is a regression which affect systemd - which mounts devtmpfs with
"-o mode=755,size=4m,nr_inodes=1m".

This patch restores the "remount" effect by calling reconfigure_single()

Fixes: 180ac53940cf ("devtmpfs: don't mix {ramfs,shmem}_fill_super() with mount_single()")
Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
index 1e2c2d3882e2c41d1417697daf65c67dda768da4..f41063ac1aee478e668913187d8571b0b4317f21 100644 (file)
--- a/drivers/base/devtmpfs.c
+++ b/drivers/base/devtmpfs.c
@@ -65,8 +65,15 @@ static struct dentry *public_dev_mount(struct file_system_type *fs_type, int fla
                      const char *dev_name, void *data)
 {
        struct super_block *s = mnt->mnt_sb;
+       int err;
+
        atomic_inc(&s->s_active);
        down_write(&s->s_umount);
+       err = reconfigure_single(s, flags, data);
+       if (err < 0) {
+               deactivate_locked_super(s);
+               return ERR_PTR(err);
+       }
        return dget(s->s_root);
 }
 

diff --git a/fs/super.c b/fs/super.c
index 3bfc0f8fbd5bc7fbe3ee94b58e1724fffacf2eee..a6405d44d4ca2e210f6277728195dfe1c7530142 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -1423,8 +1423,8 @@ struct dentry *mount_nodev(struct file_system_type *fs_type,
 }
 EXPORT_SYMBOL(mount_nodev);
 
-static int reconfigure_single(struct super_block *s,
-                             int flags, void *data)
+int reconfigure_single(struct super_block *s,
+                      int flags, void *data)
 {
        struct fs_context *fc;
        int ret;

diff --git a/include/linux/fs_context.h b/include/linux/fs_context.h
index 6b54982fc5f378ec704f56def2fdb299e7d8b42d..13fa6f3df8e4651af389223e0e1b94994ea6b172 100644 (file)
--- a/include/linux/fs_context.h
+++ b/include/linux/fs_context.h
@@ -142,6 +142,8 @@ extern void put_fs_context(struct fs_context *fc);
 extern int vfs_parse_fs_param_source(struct fs_context *fc,
                                     struct fs_parameter *param);
 extern void fc_drop_locked(struct fs_context *fc);
+int reconfigure_single(struct super_block *s,
+                      int flags, void *data);
 
 /*
  * sget() wrappers to be called from the ->get_tree() op.