tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 6c8b1a2d 54f71b03

+18 -9
+5 -1
fs/smb/server/mgmt/share_config.c
··· 165 165 166 166 share->path = kstrndup(ksmbd_share_config_path(resp), path_len, 167 167 GFP_KERNEL); 168 - if (share->path) 168 + if (share->path) { 169 169 share->path_sz = strlen(share->path); 170 + while (share->path_sz > 1 && 171 + share->path[share->path_sz - 1] == '/') 172 + share->path[--share->path_sz] = '\0'; 173 + } 170 174 share->create_mask = resp->create_mask; 171 175 share->directory_mask = resp->directory_mask; 172 176 share->force_create_mode = resp->force_create_mode;
+13 -8
fs/smb/server/oplock.c
··· 610 610 if (opinfo->op_state == OPLOCK_CLOSING) 611 611 return -ENOENT; 612 612 else if (opinfo->level <= req_op_level) { 613 - if (opinfo->is_lease && 614 - opinfo->o_lease->state != 615 - (SMB2_LEASE_HANDLE_CACHING_LE | 616 - SMB2_LEASE_READ_CACHING_LE)) 613 + if (opinfo->is_lease == false) 614 + return 1; 615 + 616 + if (opinfo->o_lease->state != 617 + (SMB2_LEASE_HANDLE_CACHING_LE | 618 + SMB2_LEASE_READ_CACHING_LE)) 617 619 return 1; 618 620 } 619 621 } 620 622 621 623 if (opinfo->level <= req_op_level) { 622 - if (opinfo->is_lease && 623 - opinfo->o_lease->state != 624 - (SMB2_LEASE_HANDLE_CACHING_LE | 625 - SMB2_LEASE_READ_CACHING_LE)) { 624 + if (opinfo->is_lease == false) { 625 + wake_up_oplock_break(opinfo); 626 + return 1; 627 + } 628 + if (opinfo->o_lease->state != 629 + (SMB2_LEASE_HANDLE_CACHING_LE | 630 + SMB2_LEASE_READ_CACHING_LE)) { 626 631 wake_up_oplock_break(opinfo); 627 632 return 1; 628 633 }