Commit 8eb604d4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents d79526b8 a09dc10d

fs/smb/server/server.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

fs/smb/server/smb2pdu.c

+2 −2
Original line number Diff line number Diff line
@@ -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)