diff options
| author | Namjae Jeon <linkinjeon@kernel.org> | 2024-05-01 21:44:02 +0900 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2024-05-04 23:53:35 -0500 |
| commit | 97c2ec64667bacc49881d2b2dd9afd4d1c3fbaeb (patch) | |
| tree | d3fdd3f250896b0fc546df1c554ccb0c20453f68 | |
| parent | cc00bc83f26eb8f2d8d9f56b949b62fd774d8432 (diff) | |
| download | linux-97c2ec64667bacc49881d2b2dd9afd4d1c3fbaeb.tar.gz | |
ksmbd: avoid to send duplicate lease break notifications
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>
| -rw-r--r-- | fs/smb/server/oplock.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/fs/smb/server/oplock.c b/fs/smb/server/oplock.c index 4978edfb15f9d7..6fd8cb7064dc18 100644 --- a/fs/smb/server/oplock.c +++ b/fs/smb/server/oplock.c @@ -613,13 +613,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; } @@ -887,7 +897,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; |