* [PATCH] afs: handle async processing of F_SETLK with FL_SLEEP flag
@ 2021-12-23 12:51 Vasily Averin
0 siblings, 0 replies; only message in thread
From: Vasily Averin @ 2021-12-23 12:51 UTC (permalink / raw)
To: David Howells, Marc Dionne; +Cc: kernel, linux-afs, linux-kernel
kernel export thread (nfsd/lockd/ksmbd) use F_SETLK cmd with set
FL_SLEEP flag to request asynchronous processing of blocking locks.
afs does not support it, does not check F_SETLK cmd and handles
FL_SLEEP flag like usual blocking lock request.
To work around the problem let's detect this situation and
drop FL_SLEEP flag before afs_do_setlk() execution.
Dropped flag should be restored back because some calling function
(nfsd4_lock) require it.
https://bugzilla.kernel.org/show_bug.cgi?id=215383
Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
---
fs/afs/flock.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/fs/afs/flock.c b/fs/afs/flock.c
index c4210a3964d8..297c859d1f54 100644
--- a/fs/afs/flock.c
+++ b/fs/afs/flock.c
@@ -778,11 +778,19 @@ int afs_lock(struct file *file, int cmd, struct file_lock *fl)
fl->fl_u.afs.debug_id = atomic_inc_return(&afs_file_lock_debug_id);
trace_afs_flock_op(vnode, fl, afs_flock_op_lock);
- if (fl->fl_type == F_UNLCK)
+ if (fl->fl_type == F_UNLCK) {
ret = afs_do_unlk(file, fl);
- else
+ } else {
+ bool async = (fl->fl_flags & FL_SLEEP) && IS_SETLK(cmd);
+
+ if (async)
+ fl->fl_flags &= ~FL_SLEEP;
+
ret = afs_do_setlk(file, fl);
+ if (async)
+ fl->fl_flags |= FL_SLEEP;
+ }
switch (ret) {
case 0: op = afs_flock_op_return_ok; break;
case -EAGAIN: op = afs_flock_op_return_eagain; break;
--
2.25.1
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-12-23 12:51 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-23 12:51 [PATCH] afs: handle async processing of F_SETLK with FL_SLEEP flag Vasily Averin
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).