NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ksmbd: send lease break notification on FILE_RENAME_INFORMATION

Browse source 
[ Upstream commit 3fc74c65b367476874da5fe6f633398674b78e5a ]

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:
Namjae Jeon 2024-01-23 20:38:53 +09:00 • committed by Greg Kroah-Hartman
parent de603a52af
commit 844dfef316
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
fs/smb/server/oplock.c
View file

@ -541,14 +541,12 @@ static struct oplock_info *same_client_has_lease(struct ksmbd_inode *ci,
continue; continue;
} }
if (lctx->req_state != lease->state)
lease->epoch++;
/* upgrading lease */ /* upgrading lease */
if ((atomic_read(&ci->op_count) + if ((atomic_read(&ci->op_count) +
atomic_read(&ci->sop_count)) == 1) { atomic_read(&ci->sop_count)) == 1) {
if (lease->state != SMB2_LEASE_NONE_LE && if (lease->state != SMB2_LEASE_NONE_LE &&
lease->state == (lctx->req_state & lease->state)) { lease->state == (lctx->req_state & lease->state)) {
lease->epoch++;
lease->state |= lctx->req_state; lease->state |= lctx->req_state;
if (lctx->req_state & if (lctx->req_state &
SMB2_LEASE_WRITE_CACHING_LE) 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) { atomic_read(&ci->sop_count)) > 1) {
if (lctx->req_state == if (lctx->req_state ==
(SMB2_LEASE_READ_CACHING_LE | (SMB2_LEASE_READ_CACHING_LE |
SMB2_LEASE_HANDLE_CACHING_LE)) SMB2_LEASE_HANDLE_CACHING_LE)) {
lease->epoch++;
lease->state = lctx->req_state; lease->state = lctx->req_state;
}
} }
if (lctx->req_state && lease->state == if (lctx->req_state && lease->state ==
SMB2_LEASE_NONE_LE) SMB2_LEASE_NONE_LE) {
lease->epoch++;
lease_none_upgrade(opinfo, lctx->req_state); lease_none_upgrade(opinfo, lctx->req_state);
}
} }
read_lock(&ci->m_lock); read_lock(&ci->m_lock);
} }

1
fs/smb/server/smb2pdu.c
View file

@ -5579,6 +5579,7 @@ static int smb2_rename(struct ksmbd_work *work,
if (!file_info->ReplaceIfExists) if (!file_info->ReplaceIfExists)
flags = RENAME_NOREPLACE; flags = RENAME_NOREPLACE;
smb_break_all_levII_oplock(work, fp, 0);
rc = ksmbd_vfs_rename(work, &fp->filp->f_path, new_name, flags); rc = ksmbd_vfs_rename(work, &fp->filp->f_path, new_name, flags);
out: out:
kfree(new_name); kfree(new_name);