Linux-Fsdevel Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Miklos Szeredi <miklos@szeredi.hu>
To: Sasha Levin <sashal@kernel.org>
Cc: Miklos Szeredi <mszeredi@redhat.com>,
	linux-fsdevel@vger.kernel.org,
	Stefan Priebe <s.priebe@profihost.ag>,
	stable <stable@vger.kernel.org>
Subject: Re: [PATCH 2/3] fuse: ignore 'data' argument of mount(..., MS_REMOUNT)
Date: Mon, 20 Jul 2020 11:14:14 +0200	[thread overview]
Message-ID: <CAJfpeguY_fBNSQiTdL0PYj6Rj7Rev9mTupVqFcvAepo2+E0Oag@mail.gmail.com> (raw)
In-Reply-To: <20200716002733.3ECE62075B@mail.kernel.org>

[-- 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;
  

  reply	other threads:[~2020-07-20  9:14 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 [this message]
2020-07-10 11:58 ` [PATCH 3/3] fuse: reject options on reconfigure via fsconfig(2) Miklos Szeredi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAJfpeguY_fBNSQiTdL0PYj6Rj7Rev9mTupVqFcvAepo2+E0Oag@mail.gmail.com \
    --to=miklos@szeredi.hu \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=mszeredi@redhat.com \
    --cc=s.priebe@profihost.ag \
    --cc=sashal@kernel.org \
    --cc=stable@vger.kernel.org \
    --subject='Re: [PATCH 2/3] fuse: ignore '\''data'\'' argument of mount(..., MS_REMOUNT)' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

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).