kernel: bump 6.1 to 6.1.75
[openwrt/staging/svanheule.git] / target / linux / generic / pending-6.1 / 540-ksmbd-only-v2-leases-handle-the-directory.patch
diff --git a/target/linux/generic/pending-6.1/540-ksmbd-only-v2-leases-handle-the-directory.patch b/target/linux/generic/pending-6.1/540-ksmbd-only-v2-leases-handle-the-directory.patch
deleted file mode 100644 (file)
index b565fbd..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-From 86b7307af26834415e1ba8597319a8b64846346f Mon Sep 17 00:00:00 2001
-From: Namjae Jeon <linkinjeon@kernel.org>
-Date: Mon, 15 Jan 2024 10:24:54 +0900
-Subject: [PATCH] ksmbd: only v2 leases handle the directory
-
-When smb2 leases is disable, ksmbd can send oplock break notification
-and cause wait oplock break ack timeout. It may appear like hang when
-accessing a directory. This patch make only v2 leases handle the
-directory.
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
-Signed-off-by: Steve French <stfrench@microsoft.com>
----
- fs/smb/server/oplock.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/fs/smb/server/oplock.c
-+++ b/fs/smb/server/oplock.c
-@@ -1191,6 +1191,12 @@ int smb_grant_oplock(struct ksmbd_work *
-       bool prev_op_has_lease;
-       __le32 prev_op_state = 0;
-+      /* Only v2 leases handle the directory */
-+      if (S_ISDIR(file_inode(fp->filp)->i_mode)) {
-+              if (!lctx || lctx->version != 2)
-+                      return 0;
-+      }
-+
-       opinfo = alloc_opinfo(work, pid, tid);
-       if (!opinfo)
-               return -ENOMEM;