torvalds/linux
3
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-03-22 07:27:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'v7.0-rc-part2-ksmbd-server-fixes' of git://git.samba.org/ksmbd

Browse Source 
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
This commit is contained in:
Linus Torvalds
2026-02-21 09:11:32 -08:00
parent d79526b895 a09dc10d13
commit 8eb604d4ee
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fs/smb/server/server.c
View File

@@ -21,7 +21,6 @@
#include "mgmt/user_session.h"
#include "crypto_ctx.h"
#include "auth.h"
#include "misc.h"
#include "stats.h"
int ksmbd_debug_types;

4
fs/smb/server/smb2pdu.c
View File

@@ -6115,14 +6115,14 @@ static int smb2_create_link(struct ksmbd_work *work,
rc = -EINVAL;
ksmbd_debug(SMB, "cannot delete %s\n",
link_name);
goto out;
}
} else {
rc = -EEXIST;
ksmbd_debug(SMB, "link already exists\n");
goto out;
}
ksmbd_vfs_kern_path_end_removing(&path);
if (rc)
goto out;
}
rc = ksmbd_vfs_link(work, target_name, link_name);
if (rc)