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.

smb: smbdirect: move fs/smb/common/smbdirect/ to fs/smb/smbdirect/

This also removes the smbdirect_ prefix from the files.

Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Link: https://lore.kernel.org/linux-cifs/CAHk-=whmue3PVi88K0UZLZO0at22QhQZ-yu+qO2TOKyZpGqecw@mail.gmail.com/
Cc: Steve French <smfrench@gmail.com>
Cc: Tom Talpey <tom@talpey.com>
Cc: Long Li <longli@microsoft.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-cifs@vger.kernel.org
Cc: samba-technical@lists.samba.org
Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Steve French <stfrench@microsoft.com>

authored by

Stefan Metzmacher and committed by
Steve French 1249c01a 5efb579e

+43 -43
+1 -1
MAINTAINERS
··· 24590 24590 L: samba-technical@lists.samba.org (moderated for non-subscribers) 24591 24591 S: Maintained 24592 24592 F: fs/smb/client/smbdirect.* 24593 - F: fs/smb/common/smbdirect/ 24593 + F: fs/smb/smbdirect/ 24594 24594 F: fs/smb/server/transport_rdma.* 24595 24595 24596 24596 SMC91x ETHERNET DRIVER
+1 -1
fs/smb/Kconfig
··· 4 4 5 5 source "fs/smb/client/Kconfig" 6 6 source "fs/smb/server/Kconfig" 7 - source "fs/smb/common/smbdirect/Kconfig" 7 + source "fs/smb/smbdirect/Kconfig" 8 8 9 9 config SMBFS 10 10 tristate
+1
fs/smb/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 2 3 3 obj-$(CONFIG_SMBFS) += common/ 4 + obj-$(CONFIG_SMBDIRECT) += smbdirect/ 4 5 obj-$(CONFIG_CIFS) += client/ 5 6 obj-$(CONFIG_SMB_SERVER) += server/
+1 -1
fs/smb/client/Kconfig
··· 182 182 bool "SMB Direct support" 183 183 depends on CIFS && INFINIBAND && INFINIBAND_ADDR_TRANS 184 184 depends on CIFS=m || INFINIBAND=y 185 - select SMB_COMMON_SMBDIRECT 185 + select SMBDIRECT 186 186 help 187 187 Enables SMB Direct support for SMB 3.0, 3.02 and 3.1.1. 188 188 SMB Direct allows transferring SMB packets over RDMA. If unsure,
+1 -1
fs/smb/client/smbdirect.c
··· 9 9 #include "cifs_debug.h" 10 10 #include "cifsproto.h" 11 11 #include "smb2proto.h" 12 - #include "../common/smbdirect/smbdirect_public.h" 12 + #include "../smbdirect/public.h" 13 13 14 14 /* Port numbers for SMBD transport */ 15 15 #define SMB_PORT 445
+1 -1
fs/smb/client/smbdirect.h
··· 12 12 13 13 #include "cifsglob.h" 14 14 15 - #include "../common/smbdirect/smbdirect.h" 15 + #include "../smbdirect/smbdirect.h" 16 16 17 17 extern int rdma_readwrite_threshold; 18 18 extern int smbd_max_frmr_depth;
-1
fs/smb/common/Makefile
··· 4 4 # 5 5 6 6 obj-$(CONFIG_SMBFS) += cifs_md4.o 7 - obj-$(CONFIG_SMB_COMMON_SMBDIRECT) += smbdirect/
+1 -1
fs/smb/common/smbdirect/Kconfig fs/smb/smbdirect/Kconfig
··· 2 2 # 3 3 # smbdirect configuration 4 4 5 - config SMB_COMMON_SMBDIRECT 5 + config SMBDIRECT 6 6 def_tristate n 7 7 depends on INFINIBAND && INFINIBAND_ADDR_TRANS 8 8 depends on m || INFINIBAND=y
-18
fs/smb/common/smbdirect/Makefile
··· 1 - # SPDX-License-Identifier: GPL-2.0-or-later 2 - # 3 - # Makefile for smbdirect support 4 - # 5 - 6 - obj-$(CONFIG_SMB_COMMON_SMBDIRECT) += smbdirect.o 7 - 8 - smbdirect-y := \ 9 - smbdirect_socket.o \ 10 - smbdirect_connection.o \ 11 - smbdirect_mr.o \ 12 - smbdirect_rw.o \ 13 - smbdirect_debug.o \ 14 - smbdirect_connect.o \ 15 - smbdirect_listen.o \ 16 - smbdirect_accept.o \ 17 - smbdirect_devices.o \ 18 - smbdirect_main.o
fs/smb/common/smbdirect/smbdirect.h fs/smb/smbdirect/smbdirect.h
+2 -2
fs/smb/common/smbdirect/smbdirect_accept.c fs/smb/smbdirect/accept.c
··· 5 5 * Copyright (c) 2025, Stefan Metzmacher 6 6 */ 7 7 8 - #include "smbdirect_internal.h" 8 + #include "internal.h" 9 9 #include <net/sock.h> 10 - #include "../../common/smb2status.h" 10 + #include "../common/smb2status.h" 11 11 12 12 static int smbdirect_accept_rdma_event_handler(struct rdma_cm_id *id, 13 13 struct rdma_cm_event *event);
+2 -2
fs/smb/common/smbdirect/smbdirect_connect.c fs/smb/smbdirect/connect.c
··· 3 3 * Copyright (c) 2012,2016,2017,2025 Stefan Metzmacher 4 4 */ 5 5 6 - #include "smbdirect_internal.h" 7 - #include "../../common/smb2status.h" 6 + #include "internal.h" 7 + #include "../common/smb2status.h" 8 8 9 9 static int smbdirect_connect_setup_connection(struct smbdirect_socket *sc); 10 10 static int smbdirect_connect_resolve_addr(struct smbdirect_socket *sc,
+1 -1
fs/smb/common/smbdirect/smbdirect_connection.c fs/smb/smbdirect/connection.c
··· 4 4 * Copyright (c) 2025, Stefan Metzmacher 5 5 */ 6 6 7 - #include "smbdirect_internal.h" 7 + #include "internal.h" 8 8 #include <linux/folio_queue.h> 9 9 10 10 struct smbdirect_map_sges {
+1 -1
fs/smb/common/smbdirect/smbdirect_debug.c fs/smb/smbdirect/debug.c
··· 4 4 * Copyright (c) 2025, Stefan Metzmacher 5 5 */ 6 6 7 - #include "smbdirect_internal.h" 7 + #include "internal.h" 8 8 #include <linux/seq_file.h> 9 9 10 10 void smbdirect_connection_legacy_debug_proc_show(struct smbdirect_socket *sc,
+1 -1
fs/smb/common/smbdirect/smbdirect_devices.c fs/smb/smbdirect/devices.c
··· 5 5 * Copyright (c) 2025 Stefan Metzmacher 6 6 */ 7 7 8 - #include "smbdirect_internal.h" 8 + #include "internal.h" 9 9 10 10 static u8 smbdirect_ib_device_rdma_capable_node_type(struct ib_device *ib_dev) 11 11 {
+3 -3
fs/smb/common/smbdirect/smbdirect_internal.h fs/smb/smbdirect/internal.h
··· 9 9 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 10 10 11 11 #include "smbdirect.h" 12 - #include "smbdirect_pdu.h" 13 - #include "smbdirect_public.h" 12 + #include "pdu.h" 13 + #include "public.h" 14 14 15 15 #include <linux/mutex.h> 16 16 ··· 34 34 35 35 extern struct smbdirect_module_state smbdirect_globals; 36 36 37 - #include "smbdirect_socket.h" 37 + #include "socket.h" 38 38 39 39 struct smbdirect_device { 40 40 struct list_head list;
+1 -1
fs/smb/common/smbdirect/smbdirect_listen.c fs/smb/smbdirect/listen.c
··· 5 5 * Copyright (c) 2025, Stefan Metzmacher 6 6 */ 7 7 8 - #include "smbdirect_internal.h" 8 + #include "internal.h" 9 9 10 10 static int smbdirect_listen_rdma_event_handler(struct rdma_cm_id *id, 11 11 struct rdma_cm_event *event);
+1 -1
fs/smb/common/smbdirect/smbdirect_main.c fs/smb/smbdirect/main.c
··· 3 3 * Copyright (c) 2025, Stefan Metzmacher 4 4 */ 5 5 6 - #include "smbdirect_internal.h" 6 + #include "internal.h" 7 7 #include <linux/module.h> 8 8 9 9 struct smbdirect_module_state smbdirect_globals = {
+1 -1
fs/smb/common/smbdirect/smbdirect_mr.c fs/smb/smbdirect/mr.c
··· 4 4 * Copyright (c) 2025, Stefan Metzmacher 5 5 */ 6 6 7 - #include "smbdirect_internal.h" 7 + #include "internal.h" 8 8 9 9 /* 10 10 * Allocate MRs used for RDMA read/write
fs/smb/common/smbdirect/smbdirect_pdu.h fs/smb/smbdirect/pdu.h
fs/smb/common/smbdirect/smbdirect_public.h fs/smb/smbdirect/public.h
+1 -1
fs/smb/common/smbdirect/smbdirect_rw.c fs/smb/smbdirect/rw.c
··· 5 5 * Copyright (c) 2025, Stefan Metzmacher 6 6 */ 7 7 8 - #include "smbdirect_internal.h" 8 + #include "internal.h" 9 9 10 10 static int smbdirect_connection_wait_for_rw_credits(struct smbdirect_socket *sc, 11 11 int credits)
+1 -1
fs/smb/common/smbdirect/smbdirect_socket.c fs/smb/smbdirect/socket.c
··· 4 4 * Copyright (c) 2025, Stefan Metzmacher 5 5 */ 6 6 7 - #include "smbdirect_internal.h" 7 + #include "internal.h" 8 8 9 9 bool smbdirect_frwr_is_supported(const struct ib_device_attr *attrs) 10 10 {
fs/smb/common/smbdirect/smbdirect_socket.h fs/smb/smbdirect/socket.h
+1 -1
fs/smb/server/Kconfig
··· 49 49 bool "Support for SMB Direct protocol" 50 50 depends on SMB_SERVER && INFINIBAND && INFINIBAND_ADDR_TRANS 51 51 depends on SMB_SERVER=m || INFINIBAND=y 52 - select SMB_COMMON_SMBDIRECT 52 + select SMBDIRECT 53 53 default n 54 54 55 55 help
+1 -1
fs/smb/server/transport_rdma.c
··· 18 18 #include "smb_common.h" 19 19 #include "../common/smb2status.h" 20 20 #include "transport_rdma.h" 21 - #include "../common/smbdirect/smbdirect_public.h" 21 + #include "../smbdirect/public.h" 22 22 23 23 24 24 #define SMB_DIRECT_PORT_IWARP 5445
+1 -1
fs/smb/server/transport_rdma.h
··· 25 25 static inline unsigned int get_smbd_max_read_write_size(struct ksmbd_transport *kt) { return 0; } 26 26 #endif 27 27 28 - #include "../common/smbdirect/smbdirect.h" 28 + #include "../smbdirect/smbdirect.h" 29 29 30 30 #endif /* __KSMBD_TRANSPORT_RDMA_H__ */
+18
fs/smb/smbdirect/Makefile
··· 1 + # SPDX-License-Identifier: GPL-2.0-or-later 2 + # 3 + # Makefile for smbdirect support 4 + # 5 + 6 + obj-$(CONFIG_SMBDIRECT) += smbdirect.o 7 + 8 + smbdirect-y := \ 9 + socket.o \ 10 + connection.o \ 11 + mr.o \ 12 + rw.o \ 13 + debug.o \ 14 + connect.o \ 15 + listen.o \ 16 + accept.o \ 17 + devices.o \ 18 + main.o