Linux-Fsdevel Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH 1/3] fuse: use ->reconfigure() instead of ->remount_fs()
@ 2020-07-10 11:58 Miklos Szeredi
  2020-07-10 11:58 ` [PATCH 2/3] fuse: ignore 'data' argument of mount(..., MS_REMOUNT) Miklos Szeredi
  2020-07-10 11:58 ` [PATCH 3/3] fuse: reject options on reconfigure via fsconfig(2) Miklos Szeredi
  0 siblings, 2 replies; 5+ messages in thread
From: Miklos Szeredi @ 2020-07-10 11:58 UTC (permalink / raw)
  To: linux-fsdevel; +Cc: Stefan Priebe, David Howells, stable

s_op->remount_fs() is only called from legacy_reconfigure(), which is not
used after being converted to the new API.

Convert to using ->reconfigure().  This restores the previous behavior of
syncing the filesystem and rejecting MS_MANDLOCK on remount.

Fixes: c30da2e981a7 ("fuse: convert to use the new mount API")
Cc: <stable@vger.kernel.org> # v5.4
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
---
 fs/fuse/inode.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 5b4aebf5821f..be39dff57c28 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -121,10 +121,12 @@ static void fuse_evict_inode(struct inode *inode)
 	}
 }
 
-static int fuse_remount_fs(struct super_block *sb, int *flags, char *data)
+static int fuse_reconfigure(struct fs_context *fc)
 {
+	struct super_block *sb = fc->root->d_sb;
+
 	sync_filesystem(sb);
-	if (*flags & SB_MANDLOCK)
+	if (fc->sb_flags & SB_MANDLOCK)
 		return -EINVAL;
 
 	return 0;
@@ -817,7 +819,6 @@ static const struct super_operations fuse_super_operations = {
 	.evict_inode	= fuse_evict_inode,
 	.write_inode	= fuse_write_inode,
 	.drop_inode	= generic_delete_inode,
-	.remount_fs	= fuse_remount_fs,
 	.put_super	= fuse_put_super,
 	.umount_begin	= fuse_umount_begin,
 	.statfs		= fuse_statfs,
@@ -1296,6 +1297,7 @@ static int fuse_get_tree(struct fs_context *fc)
 static const struct fs_context_operations fuse_context_ops = {
 	.free		= fuse_free_fc,
 	.parse_param	= fuse_parse_param,
+	.reconfigure	= fuse_reconfigure,
 	.get_tree	= fuse_get_tree,
 };
 
-- 
2.21.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2020-07-20  9:14 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-10 11:58 [PATCH 1/3] fuse: use ->reconfigure() instead of ->remount_fs() Miklos Szeredi
2020-07-10 11:58 ` [PATCH 2/3] fuse: ignore 'data' argument of mount(..., MS_REMOUNT) Miklos Szeredi
2020-07-16  0:27   ` Sasha Levin
2020-07-20  9:14     ` Miklos Szeredi
2020-07-10 11:58 ` [PATCH 3/3] fuse: reject options on reconfigure via fsconfig(2) Miklos Szeredi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).