From: Vasily Averin <vvs@virtuozzo.com>
To: Trond Myklebust <trond.myklebust@hammerspace.com>,
Anna Schumaker <anna.schumaker@netapp.com>
Cc: kernel@openvz.org, linux-nfs@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] nfs: local_lock: handle async processing of F_SETLK with FL_SLEEP
Date: Tue, 28 Dec 2021 04:00:02 +0300 [thread overview]
Message-ID: <2305d90b-d1b2-6924-7d93-b29848eeb92e@virtuozzo.com> (raw)
In-Reply-To: <3e5d6777-9365-c853-071f-3e9fc4df922c@virtuozzo.com>
Patch is wrong,
I missed that FL_FLOCK are handled here too.
On 27.12.2021 18:50, Vasily Averin wrote:
> nfsd and lockd use F_SETLK cmd with the FL_SLEEP flag set to request
> asynchronous processing of blocking locks.
>
> Currently nfs mounted with 'local_lock' option use locks_lock_file_wait()
> function blocked on such requests.
>
> To handle such requests properly, non-blocking posix_file_lock()
> function should be used instead.
>
> https://bugzilla.kernel.org/show_bug.cgi?id=215383
> Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
> ---
> v2: fixed 'fl_flags && FL_SLEEP' => 'fl_flags & FL_SLEEP'
> ---
> fs/nfs/file.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/fs/nfs/file.c b/fs/nfs/file.c
> index 24e7dccce355..38e1821cff5d 100644
> --- a/fs/nfs/file.c
> +++ b/fs/nfs/file.c
> @@ -769,9 +769,11 @@ do_setlk(struct file *filp, int cmd, struct file_lock *fl, int is_local)
> */
> if (!is_local)
> status = NFS_PROTO(inode)->lock(filp, cmd, fl);
> + else if ((fl->fl_flags & FL_SLEEP) && IS_SETLK(cmd))
> + status = posix_lock_file(filp, fl, NULL);
> else
> status = locks_lock_file_wait(filp, fl);
> - if (status < 0)
> + if (status)
> goto out;
>
> /*
>
next prev parent reply other threads:[~2021-12-28 1:00 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-27 10:45 [PATCH] nfs: local_lock: handle async processing of F_SETLK with FL_SLEEP Vasily Averin
2021-12-27 12:59 ` kernel test robot
2021-12-27 12:59 ` kernel test robot
2021-12-27 15:50 ` [PATCH v2] " Vasily Averin
2021-12-28 1:00 ` Vasily Averin [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-12-28 4:19 [PATCH] " kernel test robot
2022-01-06 10:29 ` Dan Carpenter
2022-01-06 10:29 ` Dan Carpenter
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=2305d90b-d1b2-6924-7d93-b29848eeb92e@virtuozzo.com \
--to=vvs@virtuozzo.com \
--cc=anna.schumaker@netapp.com \
--cc=kernel@openvz.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@hammerspace.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.