]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ksmbd: don't update ->op_state as OPLOCK_STATE_NONE on error
authorNamjae Jeon <linkinjeon@kernel.org>
Mon, 18 Dec 2023 15:34:54 +0000 (00:34 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 23 Dec 2023 09:42:00 +0000 (10:42 +0100)
[ Upstream commit cd80ce7e68f1624ac29cd0a6b057789d1236641e ]

ksmbd set ->op_state as OPLOCK_STATE_NONE on lease break ack error.
op_state of lease should not be updated because client can send lease
break ack again. This patch fix smb2.lease.breaking2 test failure.

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>
fs/ksmbd/smb2pdu.c

index fd174b469bcbd9c99b7c75b367786891ff42b4f9..7ce5746f9167421670ffb54850d6e4c06b9acd21 100644 (file)
@@ -8237,7 +8237,6 @@ static void smb21_lease_break_ack(struct ksmbd_work *work)
                return;
 
 err_out:
-       opinfo->op_state = OPLOCK_STATE_NONE;
        wake_up_interruptible_all(&opinfo->oplock_q);
        atomic_dec(&opinfo->breaking_cnt);
        wake_up_interruptible_all(&opinfo->oplock_brk);