mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
ksmbd: send lease break notification on FILE_RENAME_INFORMATION
[ Upstream commit 3fc74c65b3
]
Send lease break notification on FILE_RENAME_INFORMATION request.
This patch fix smb2.lease.v2_epoch2 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>
This commit is contained in:
parent
9554d4934b
commit
f5ef78c4ab
2 changed files with 8 additions and 5 deletions
|
@ -541,14 +541,12 @@ static struct oplock_info *same_client_has_lease(struct ksmbd_inode *ci,
|
|||
continue;
|
||||
}
|
||||
|
||||
if (lctx->req_state != lease->state)
|
||||
lease->epoch++;
|
||||
|
||||
/* upgrading lease */
|
||||
if ((atomic_read(&ci->op_count) +
|
||||
atomic_read(&ci->sop_count)) == 1) {
|
||||
if (lease->state != SMB2_LEASE_NONE_LE &&
|
||||
lease->state == (lctx->req_state & lease->state)) {
|
||||
lease->epoch++;
|
||||
lease->state |= lctx->req_state;
|
||||
if (lctx->req_state &
|
||||
SMB2_LEASE_WRITE_CACHING_LE)
|
||||
|
@ -559,13 +557,17 @@ static struct oplock_info *same_client_has_lease(struct ksmbd_inode *ci,
|
|||
atomic_read(&ci->sop_count)) > 1) {
|
||||
if (lctx->req_state ==
|
||||
(SMB2_LEASE_READ_CACHING_LE |
|
||||
SMB2_LEASE_HANDLE_CACHING_LE))
|
||||
SMB2_LEASE_HANDLE_CACHING_LE)) {
|
||||
lease->epoch++;
|
||||
lease->state = lctx->req_state;
|
||||
}
|
||||
}
|
||||
|
||||
if (lctx->req_state && lease->state ==
|
||||
SMB2_LEASE_NONE_LE)
|
||||
SMB2_LEASE_NONE_LE) {
|
||||
lease->epoch++;
|
||||
lease_none_upgrade(opinfo, lctx->req_state);
|
||||
}
|
||||
}
|
||||
read_lock(&ci->m_lock);
|
||||
}
|
||||
|
|
|
@ -5581,6 +5581,7 @@ static int smb2_rename(struct ksmbd_work *work,
|
|||
if (!file_info->ReplaceIfExists)
|
||||
flags = RENAME_NOREPLACE;
|
||||
|
||||
smb_break_all_levII_oplock(work, fp, 0);
|
||||
rc = ksmbd_vfs_rename(work, &fp->filp->f_path, new_name, flags);
|
||||
out:
|
||||
kfree(new_name);
|
||||
|
|
Loading…
Reference in a new issue