]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
openpromfs: finish conversion to the new mount API
authorEric Sandeen <sandeen@redhat.com>
Fri, 1 Mar 2024 22:33:11 +0000 (16:33 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 May 2024 07:48:56 +0000 (09:48 +0200)
[ Upstream commit 8f27829974b025d4df2e78894105d75e3bf349f0 ]

The original mount API conversion inexplicably left out the change
from ->remount_fs to ->reconfigure; do that now.

Fixes: 7ab2fa7693c3 ("vfs: Convert openpromfs to use the new mount API")
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Link: https://lore.kernel.org/r/90b968aa-c979-420f-ba37-5acc3391b28f@redhat.com
Signed-off-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/openpromfs/inode.c

index c4b65a6d41cc345c83e4729d3f9a76cad66391e3..5cf1809d47bdb9cfd164ed7fbe04ce83cc303168 100644 (file)
@@ -355,10 +355,10 @@ static struct inode *openprom_iget(struct super_block *sb, ino_t ino)
        return inode;
 }
 
-static int openprom_remount(struct super_block *sb, int *flags, char *data)
+static int openpromfs_reconfigure(struct fs_context *fc)
 {
-       sync_filesystem(sb);
-       *flags |= SB_NOATIME;
+       sync_filesystem(fc->root->d_sb);
+       fc->sb_flags |= SB_NOATIME;
        return 0;
 }
 
@@ -366,7 +366,6 @@ static const struct super_operations openprom_sops = {
        .alloc_inode    = openprom_alloc_inode,
        .free_inode     = openprom_free_inode,
        .statfs         = simple_statfs,
-       .remount_fs     = openprom_remount,
 };
 
 static int openprom_fill_super(struct super_block *s, struct fs_context *fc)
@@ -415,6 +414,7 @@ static int openpromfs_get_tree(struct fs_context *fc)
 
 static const struct fs_context_operations openpromfs_context_ops = {
        .get_tree       = openpromfs_get_tree,
+       .reconfigure    = openpromfs_reconfigure,
 };
 
 static int openpromfs_init_fs_context(struct fs_context *fc)