From: Chuck Lever <chuck.lever@oracle.com>
To: Jeff Layton <jlayton@kernel.org>
Cc: Neil Brown <neilb@suse.de>, Olga Kornievskaia <kolga@netapp.com>,
Dai Ngo <Dai.Ngo@oracle.com>, Tom Talpey <tom@talpey.com>,
linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] nfsd: nfsd_file_lease_notifier_call gets a file_lease as an argument
Date: Fri, 12 Jul 2024 13:08:46 -0400 [thread overview]
Message-ID: <ZpFjHrWCLhTivuOl@tissot.1015granger.net> (raw)
In-Reply-To: <20240712-nfsd-next-v1-1-58c5f2557436@kernel.org>
On Fri, Jul 12, 2024 at 07:26:44AM -0400, Jeff Layton wrote:
> "data" actually refers to a file_lease and not a file_lock. Both structs
> have their file_lock_core as the first field though, so this bug should
> be harmless without struct randomization in play.
>
> Fixes: 05580bbfc6bc ("nfsd: adapt to breakup of struct file_lock")
> Signed-off-by: Jeff Layton <jlayton@kernel.org>
> ---
> fs/nfsd/filecache.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c
> index 88dac1abdde3..ea506882fec2 100644
> --- a/fs/nfsd/filecache.c
> +++ b/fs/nfsd/filecache.c
> @@ -667,7 +667,7 @@ static int
> nfsd_file_lease_notifier_call(struct notifier_block *nb, unsigned long arg,
> void *data)
> {
> - struct file_lock *fl = data;
> + struct file_lease *fl = data;
>
> /* Only close files for F_SETLEASE leases */
> if (fl->c.flc_flags & FL_LEASE)
>
> ---
> base-commit: f862772862db0e2bbd711a03ac6e6cff89e306cb
> change-id: 20240712-nfsd-next-ba50db14fc85
>
> Best regards,
> --
> Jeff Layton <jlayton@kernel.org>
>
Applied to nfsd-next (for v6.11) with the addition of Reported-by:,
Closes:, and Tested-by: tags.
--
Chuck Lever
prev parent reply other threads:[~2024-07-12 17:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-12 11:26 Jeff Layton
2024-07-12 17:08 ` Chuck Lever [this message]
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=ZpFjHrWCLhTivuOl@tissot.1015granger.net \
--to=chuck.lever@oracle.com \
--cc=Dai.Ngo@oracle.com \
--cc=jlayton@kernel.org \
--cc=kolga@netapp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=neilb@suse.de \
--cc=tom@talpey.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®