ksmbd: avoid to send duplicate lease break notifications

commit 97c2ec64667bacc49881d2b2dd9afd4d1c3fbaeb upstream.

This patch fixes generic/011 when enable smb2 leases.

if ksmbd sends multiple notifications for a file, cifs increments
the reference count of the file but it does not decrement the count by
the failure of queue_work.
So even if the file is closed, cifs does not send a SMB2_CLOSE request.

Cc: stable@vger.kernel.org
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/smb/server/oplock.c b/fs/smb/server/oplock.c
index 53dfaac425c68dc5f2192924b546b4f9fb71f6c8..bee2d18978340a287ba4b55352fd1724ddc8cb4a 100644 (file)
--- a/fs/smb/server/oplock.c
+++ b/fs/smb/server/oplock.c
@@ -612,13 +612,23 @@ static int oplock_break_pending(struct oplock_info *opinfo, int req_op_level)
 
                if (opinfo->op_state == OPLOCK_CLOSING)
                        return -ENOENT;
-               else if (!opinfo->is_lease && opinfo->level <= req_op_level)
-                       return 1;
+               else if (opinfo->level <= req_op_level) {
+                       if (opinfo->is_lease &&
+                           opinfo->o_lease->state !=
+                            (SMB2_LEASE_HANDLE_CACHING_LE |
+                             SMB2_LEASE_READ_CACHING_LE))
+                               return 1;
+               }
        }
 
-       if (!opinfo->is_lease && opinfo->level <= req_op_level) {
-               wake_up_oplock_break(opinfo);
-               return 1;
+       if (opinfo->level <= req_op_level) {
+               if (opinfo->is_lease &&
+                   opinfo->o_lease->state !=
+                    (SMB2_LEASE_HANDLE_CACHING_LE |
+                     SMB2_LEASE_READ_CACHING_LE)) {
+                       wake_up_oplock_break(opinfo);
+                       return 1;
+               }
        }
        return 0;
 }
@@ -886,7 +896,6 @@ static int oplock_break(struct oplock_info *brk_opinfo, int req_op_level)
                struct lease *lease = brk_opinfo->o_lease;
 
                atomic_inc(&brk_opinfo->breaking_cnt);
-
                err = oplock_break_pending(brk_opinfo, req_op_level);
                if (err)
                        return err < 0 ? err : 0;