From: Vasily Averin <vvs@virtuozzo.com>
To: Namjae Jeon <linkinjeon@kernel.org>,
Sergey Senozhatsky <senozhatsky@chromium.org>,
Steve French <sfrench@samba.org>,
Hyunchul Lee <hyc.lee@gmail.com>
Cc: kernel@openvz.org, linux-cifs@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] ksmbd: use F_SETLK to force vfs_file_lock() to return asynchronously
Date: Sun, 19 Dec 2021 12:34:54 +0300 [thread overview]
Message-ID: <e2aef4e7-a9b9-e44e-94a2-29ed6bc20091@virtuozzo.com> (raw)
To avoid possible deadlock ksmbd should process locks asynchronously.
Callers expecting vfs_file_locks() to return asynchronously should only
use F_SETLK, not F_SETLKW.
Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
---
fs/ksmbd/smb2pdu.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/ksmbd/smb2pdu.c b/fs/ksmbd/smb2pdu.c
index 0c020deb76bb..34f333549767 100644
--- a/fs/ksmbd/smb2pdu.c
+++ b/fs/ksmbd/smb2pdu.c
@@ -6646,13 +6646,13 @@ static int smb2_set_flock_flags(struct file_lock *flock, int flags)
switch (flags) {
case SMB2_LOCKFLAG_SHARED:
ksmbd_debug(SMB, "received shared request\n");
- cmd = F_SETLKW;
+ cmd = F_SETLK;
flock->fl_type = F_RDLCK;
flock->fl_flags |= FL_SLEEP;
break;
case SMB2_LOCKFLAG_EXCLUSIVE:
ksmbd_debug(SMB, "received exclusive request\n");
- cmd = F_SETLKW;
+ cmd = F_SETLK;
flock->fl_type = F_WRLCK;
flock->fl_flags |= FL_SLEEP;
break;
--
2.25.1
next reply other threads:[~2021-12-19 9:35 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-19 9:34 Vasily Averin [this message]
2021-12-21 12:02 ` [PATCH] ksmbd: use F_SETLK to force vfs_file_lock() to return asynchronously Namjae Jeon
2021-12-21 13:08 ` Vasily Averin
2021-12-22 2:50 ` Namjae Jeon
2021-12-22 4:32 ` Vasily Averin
2021-12-22 5:25 ` Namjae Jeon
2021-12-22 6:51 ` Vasily Averin
2021-12-22 7:40 ` Vasily Averin
2021-12-22 8:58 ` Namjae Jeon
2021-12-22 15:17 ` Vasily Averin
2021-12-24 12:31 ` Vasily Averin
2021-12-24 23:08 ` Namjae Jeon
2021-12-27 7:08 ` Vasily Averin
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=e2aef4e7-a9b9-e44e-94a2-29ed6bc20091@virtuozzo.com \
--to=vvs@virtuozzo.com \
--cc=hyc.lee@gmail.com \
--cc=kernel@openvz.org \
--cc=linkinjeon@kernel.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=senozhatsky@chromium.org \
--cc=sfrench@samba.org \
/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;
as well as URLs for NNTP newsgroup(s).