[Devel] [PATCH RHEL7 COMMIT] ms/fuse: async processing of F_SETLK with FL_SLEEP flag

[Vasily Averin]

The commit is pushed to "branch-rh7-3.10.0-1160.42.2.vz7.184.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-1160.42.2.vz7.184.7
------>
commit 6d7c05f6ec82c35aaa31429623e95496571e95a6
Author: Vasily Averin <vvs at virtuozzo.com>
Date:   Thu Dec 30 16:58:30 2021 +0300

    ms/fuse: async processing of F_SETLK with FL_SLEEP flag
    
    kernel export thread (nfsd/lockd/ksmbd) use F_SETLK cmd with set FL_SLEEP
    flag to request asynchronous processing of blocking locks.
    Fuse does not support async processing and should drop FL_SLEEP flag
    to avoid execution of blocking FUSE_SETLKW request.
    Dropped FL_SLEEP flag should be restored back, because it can be used
    in caller, at least in nfsd4_lock() does it actually.
    
    https://bugzilla.kernel.org/show_bug.cgi?id=215383
    (patch was submitted upstream but not merged yet)
    https://jira.sw.ru/browse/PSBM-136851
    Signed-off-by: Vasily Averin <vvs at virtuozzo.com>
---
 fs/fuse/file.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index dd98166..7114482 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -2808,8 +2808,17 @@ static int fuse_file_lock(struct file *file, int cmd, struct file_lock *fl)
 	} else {
 		if (fc->no_lock)
 			err = posix_lock_file(file, fl, NULL);
-		else
+		else {
+			bool async = (fl->fl_flags & FL_SLEEP) && IS_SETLK(cmd);
+
+			if (async)
+				fl->fl_flags &= ~FL_SLEEP;
+
 			err = fuse_setlk(file, fl, 0);
+
+			if (async)
+				fl->fl_flags |= FL_SLEEP;
+		}
 	}
 	return err;
 }