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 'v7.0-rc-part2-ksmbd-server-fixes' of git://git.samba.org/ksmbd

Pull smb server fixes from Steve French:
"Two small fixes:

- fix potential deadlock

- minor cleanup"

* tag 'v7.0-rc-part2-ksmbd-server-fixes' of git://git.samba.org/ksmbd:
ksmbd: call ksmbd_vfs_kern_path_end_removing() on some error paths
smb: server: Remove duplicate include of misc.h

Linus Torvalds 8eb604d4 d79526b8

+2 -3
-1
fs/smb/server/server.c
··· 21 21 #include "mgmt/user_session.h" 22 22 #include "crypto_ctx.h" 23 23 #include "auth.h" 24 - #include "misc.h" 25 24 #include "stats.h" 26 25 27 26 int ksmbd_debug_types;
+2 -2
fs/smb/server/smb2pdu.c
··· 6115 6115 rc = -EINVAL; 6116 6116 ksmbd_debug(SMB, "cannot delete %s\n", 6117 6117 link_name); 6118 - goto out; 6119 6118 } 6120 6119 } else { 6121 6120 rc = -EEXIST; 6122 6121 ksmbd_debug(SMB, "link already exists\n"); 6123 - goto out; 6124 6122 } 6125 6123 ksmbd_vfs_kern_path_end_removing(&path); 6124 + if (rc) 6125 + goto out; 6126 6126 } 6127 6127 rc = ksmbd_vfs_link(work, target_name, link_name); 6128 6128 if (rc)