Commit ce825345 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'v6.19-rc-smb3-server-fixes' of git://git.samba.org/ksmbd 

Pull smb server fixes from Steve French:

 - minor cleanup

 - minor update to comment to avoid confusion about fs type

* tag 'v6.19-rc-smb3-server-fixes' of git://git.samba.org/ksmbd:
  smb/server: add comment to FileSystemName of FileFsAttributeInformation
  smb/server: remove unused nterr.h
  smb/server: rename include guard in smb_common.h
parents 10cc3e9a 2e0d224d

fs/smb/server/nterr.h

deleted100644 → 0
+0 −543

File deleted.

Preview size limit exceeded, changes collapsed.

fs/smb/server/smb2misc.c

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
 */



#include "glob.h"

#include "nterr.h"

#include "smb_common.h"

#include "../common/smb2status.h"

#include "mgmt/user_session.h"

fs/smb/server/smb2pdu.c

+7 −0
Original line number Diff line number Diff line
@@ -5497,6 +5497,13 @@ static int smb2_get_info_filesystem(struct ksmbd_work *work, 
			info->Attributes |= cpu_to_le32(FILE_NAMED_STREAMS);



		info->MaxPathNameComponentLength = cpu_to_le32(stfs.f_namelen);

		/*

		 * some application(potableapp) can not run on ksmbd share

		 * because only NTFS handle security setting on windows.

		 * So Although local fs(EXT4 or F2fs, etc) is not NTFS,

		 * ksmbd should show share as NTFS. Later, If needed, we can add

		 * fs type(s) parameter to change fs type user wanted.

		 */

		len = smbConvertToUTF16((__le16 *)info->FileSystemName,

					"NTFS", PATH_MAX, conn->local_nls, 0);

		len = len * 2;

fs/smb/server/smb_common.h

+3 −4
Original line number Diff line number Diff line
@@ -3,13 +3,12 @@ 
 *   Copyright (C) 2018 Samsung Electronics Co., Ltd.

 */



#ifndef __SMB_COMMON_H__

#define __SMB_COMMON_H__

#ifndef __SMB_SERVER_COMMON_H__

#define __SMB_SERVER_COMMON_H__



#include <linux/kernel.h>



#include "glob.h"

#include "nterr.h"

#include "../common/smbglob.h"

#include "../common/smb2pdu.h"

#include "../common/fscc.h"
@@ -203,4 +202,4 @@ unsigned int ksmbd_server_side_copy_max_chunk_size(void); 
unsigned int ksmbd_server_side_copy_max_total_size(void);

bool is_asterisk(char *p);

__le32 smb_map_generic_desired_access(__le32 daccess);

#endif /* __SMB_COMMON_H__ */
 
#endif /* __SMB_SERVER_COMMON_H__ */