Merge tag '6.10-rc-ksmbd-server-fixes' of git://git.samba.org/ksmbd
Pull smb server fixes from Steve French: "Two ksmbd server fixes, both for stable" * tag '6.10-rc-ksmbd-server-fixes' of git://git.samba.org/ksmbd: ksmbd: ignore trailing slashes in share paths ksmbd: avoid to send duplicate oplock break notifications
This commit is contained in:
@@ -165,8 +165,12 @@ static struct ksmbd_share_config *share_config_request(struct unicode_map *um,
|
||||
|
||||
share->path = kstrndup(ksmbd_share_config_path(resp), path_len,
|
||||
GFP_KERNEL);
|
||||
if (share->path)
|
||||
if (share->path) {
|
||||
share->path_sz = strlen(share->path);
|
||||
while (share->path_sz > 1 &&
|
||||
share->path[share->path_sz - 1] == '/')
|
||||
share->path[--share->path_sz] = '\0';
|
||||
}
|
||||
share->create_mask = resp->create_mask;
|
||||
share->directory_mask = resp->directory_mask;
|
||||
share->force_create_mode = resp->force_create_mode;
|
||||
|
||||
+13
-8
@@ -610,19 +610,24 @@ static int oplock_break_pending(struct oplock_info *opinfo, int req_op_level)
|
||||
if (opinfo->op_state == OPLOCK_CLOSING)
|
||||
return -ENOENT;
|
||||
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))
|
||||
if (opinfo->is_lease == false)
|
||||
return 1;
|
||||
|
||||
if (opinfo->o_lease->state !=
|
||||
(SMB2_LEASE_HANDLE_CACHING_LE |
|
||||
SMB2_LEASE_READ_CACHING_LE))
|
||||
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)) {
|
||||
if (opinfo->is_lease == false) {
|
||||
wake_up_oplock_break(opinfo);
|
||||
return 1;
|
||||
}
|
||||
if (opinfo->o_lease->state !=
|
||||
(SMB2_LEASE_HANDLE_CACHING_LE |
|
||||
SMB2_LEASE_READ_CACHING_LE)) {
|
||||
wake_up_oplock_break(opinfo);
|
||||
return 1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user