diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-12-12 21:59:19 +1200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-12-12 21:59:19 +1200 |
| commit | ce825345dd63f62cdab80a8c45f943bb65511aa1 (patch) | |
| tree | f7b4d6adb3a00b8520b0287d0aa233e9eb99a46e /fs/smb/server/smb_common.h | |
| parent | 10cc3e9a11dc0d5d8450ecf6db99551c867f3203 (diff) | |
| parent | 2e0d224d89884819e6f25953bbe860ae6a49555f (diff) | |
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
Diffstat (limited to 'fs/smb/server/smb_common.h')
| -rw-r--r-- | fs/smb/server/smb_common.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/smb/server/smb_common.h b/fs/smb/server/smb_common.h index 2baf4aa330eb..067b45048c73 100644 --- a/fs/smb/server/smb_common.h +++ b/fs/smb/server/smb_common.h @@ -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__ */ |