Re: [PATCH 2/3] fuse: ignore 'data' argument of mount(..., MS_REMOUNT)

[Miklos Szeredi <miklos@szeredi.hu>]

[-- Attachment #1: Type: text/plain, Size: 764 bytes --]

On Thu, Jul 16, 2020 at 2:27 AM Sasha Levin <sashal@kernel.org> wrote:
>
> Hi
>
> [This is an automated email]
>
> This commit has been processed because it contains a "Fixes:" tag
> fixing commit: c30da2e981a7 ("fuse: convert to use the new mount API").
>
> The bot has tested the following trees: v5.7.8, v5.4.51.
>
> v5.7.8: Build OK!
> v5.4.51: Failed to apply! Possible dependencies:
>     7f5d38141e309 ("new primitive: __fs_parse()")
>     82995cc6c5ae4 ("libceph, rbd, ceph: convert to use the new mount API")
>     d7167b149943e ("fs_parse: fold fs_parameter_desc/fs_parameter_spec")
>
>
> NOTE: The patch will not be queued to stable trees until it is upstream.
>
> How should we proceed with this patch?

Conflict resolution is trivial.

Thanks,
Miklos

[-- Attachment #2: merge.patch --]
[-- Type: text/x-patch, Size: 570 bytes --]

diff --cc fs/fuse/inode.c
index 16aec32f7f3d,ba201bf5ffad..000000000000
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@@ -473,7 -477,14 +473,14 @@@ static int fuse_parse_param(struct fs_c
  	struct fuse_fs_context *ctx = fc->fs_private;
  	int opt;
  
+ 	/*
+ 	 * Ignore options coming from mount(MS_REMOUNT) for backward
+ 	 * compatibility.
+ 	 */
+ 	if (fc->purpose == FS_CONTEXT_FOR_RECONFIGURE)
+ 		return 0;
+ 
 -	opt = fs_parse(fc, fuse_fs_parameters, param, &result);
 +	opt = fs_parse(fc, &fuse_fs_parameters, param, &result);
  	if (opt < 0)
  		return opt;