Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2224938/?format=api
{ "id": 2224938, "url": "http://patchwork.ozlabs.org/api/patches/2224938/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linux-cifs-client/patch/20260419192018.3046449-1-metze@samba.org/", "project": { "id": 12, "url": "http://patchwork.ozlabs.org/api/projects/12/?format=api", "name": "Linux CIFS Client", "link_name": "linux-cifs-client", "list_id": "linux-cifs.vger.kernel.org", "list_email": "linux-cifs@vger.kernel.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20260419192018.3046449-1-metze@samba.org>", "list_archive_url": null, "date": "2026-04-19T19:20:18", "name": "smb: smbdirect: move fs/smb/common/smbdirect/ to fs/smb/smbdirect/", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "74b6be8ab4b3ed4b93525ad10b213bf80018f337", "submitter": { "id": 8149, "url": "http://patchwork.ozlabs.org/api/people/8149/?format=api", "name": "Stefan Metzmacher", "email": "metze@samba.org" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/linux-cifs-client/patch/20260419192018.3046449-1-metze@samba.org/mbox/", "series": [ { "id": 500526, "url": "http://patchwork.ozlabs.org/api/series/500526/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linux-cifs-client/list/?series=500526", "date": "2026-04-19T19:20:18", "name": "smb: smbdirect: move fs/smb/common/smbdirect/ to fs/smb/smbdirect/", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/500526/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2224938/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2224938/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "\n <linux-cifs+bounces-10917-incoming=patchwork.ozlabs.org@vger.kernel.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "linux-cifs@vger.kernel.org" ], "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (3072-bit key;\n secure) header.d=samba.org header.i=@samba.org header.a=rsa-sha256\n header.s=42 header.b=VORilKVH;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=172.234.253.10; helo=sea.lore.kernel.org;\n envelope-from=linux-cifs+bounces-10917-incoming=patchwork.ozlabs.org@vger.kernel.org;\n receiver=patchwork.ozlabs.org)", "smtp.subspace.kernel.org;\n\tdkim=pass (3072-bit key) header.d=samba.org header.i=@samba.org\n header.b=\"VORilKVH\"", "smtp.subspace.kernel.org;\n arc=none smtp.client-ip=144.76.82.148", "smtp.subspace.kernel.org;\n dmarc=pass (p=quarantine dis=none) header.from=samba.org", "smtp.subspace.kernel.org;\n spf=pass smtp.mailfrom=samba.org" ], "Received": [ "from sea.lore.kernel.org (sea.lore.kernel.org [172.234.253.10])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fzJPh22CZz1yGt\n\tfor <incoming@patchwork.ozlabs.org>; Mon, 20 Apr 2026 05:21:12 +1000 (AEST)", "from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby sea.lore.kernel.org (Postfix) with ESMTP id 4EC9330136A1\n\tfor <incoming@patchwork.ozlabs.org>; Sun, 19 Apr 2026 19:21:10 +0000 (UTC)", "from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id 0423B29B8D3;\n\tSun, 19 Apr 2026 19:21:09 +0000 (UTC)", "from hr2.samba.org (hr2.samba.org [144.76.82.148])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby smtp.subspace.kernel.org (Postfix) with ESMTPS id 6972C26C3BD\n\tfor <linux-cifs@vger.kernel.org>; Sun, 19 Apr 2026 19:21:06 +0000 (UTC)", "from [127.0.0.2] (localhost [127.0.0.1])\n\tby hr2.samba.org with esmtpsa\n (TLS1.3:ECDHE_SECP256R1__ECDSA_SECP256R1_SHA256__CHACHA20_POLY1305:256)\n\t(Exim)\n\tid 1wEXhQ-00000002WTc-1qVU;\n\tSun, 19 Apr 2026 19:20:56 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1776626468; cv=none;\n b=m0Szozgg7xMvjayQAf6Q0wMUagAVztNhgvF8HqWNtNSXX9IGjaYpwBW4tEB9TshosULE552CDrr+q+ozK+9Ua719jOMVulzBCTrF9/tcEQMDNgBKmihV4qADXvOjbfLBRJiPo3KvTloTLWiXyiULuxRyU/fMqrcLlJpvitF7/Ts=", "ARC-Message-Signature": "i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1776626468; c=relaxed/simple;\n\tbh=BPl7ADuNz7/gW/pd0zDxbcxpiGfp8YXTzEBUvCbIbsM=;\n\th=From:To:Cc:Subject:Date:Message-ID:MIME-Version;\n b=tlXYU95Ybb9vsfarfN9MxGs41ggCyOrUHU1nBDbaPzc/v38DiILqTiWd3RQi3BUqSVHNUNqCXROWzICQMUBk0HT9PVr++6JPmnS1SuAaw+1muPtEcDEyVr7gx+yfsP6wgUlxX4td0sXd9KAxlJO+C/GlVhq0QU6mTB2UwiEn8c4=", "ARC-Authentication-Results": "i=1; smtp.subspace.kernel.org;\n dmarc=pass (p=quarantine dis=none) header.from=samba.org;\n spf=pass smtp.mailfrom=samba.org;\n dkim=pass (3072-bit key) header.d=samba.org header.i=@samba.org\n header.b=VORilKVH; arc=none smtp.client-ip=144.76.82.148", "DKIM-Signature": "v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=samba.org;\n\ts=42; h=Message-ID:Date:Cc:To:From;\n\tbh=vCaVSS2sema6KjUMGL5frMyotatJdO4QufmlJruy170=; b=VORilKVHDvhRxo5gnYxKRPPjYE\n\tDjNC3cQ0vhszupkd/dwgtsO1xYFcPH4ODZ8GSxiZny8bfsE5gXCPnhmlIqUdcHqI00M7jw+Q92EfL\n\tCwkzeNV19ZmGthGKuQb6S5wIeS+EfPmaSqNp8umi+xXUQVRU/x4Rl6cv75Hf+n4uQKCGg/hfC8mD3\n\ti4U8OED03bUeX//ifUaikLd3fKfLWOdRBiXqI5G1JZ5ru8D+OQGZMoIZ3kt1bhFHF0n/+3u2zI7O/\n\t36yMegWCV9O6uPGH1KGWhM2Gm35+MwumcgdPhIg6WCBca9qBrH82Jw85D1JQyyC0UyM84XiBdB7bK\n\t8jEZn3IqnXahyeDrPEp7DTvotWDwJZvEtRA+hZiY7eJPth/0wT/dylYbpVdP9L1SO4bKyycEJzz4m\n\tJygAJs3qb7HMWYTiW3DztdI1fpHOcMmd4KRBlVfC0yRa7FBH0Hdt0yXeDJilSoq+z6IiUkRb46FE3\n\tNquF5Wd04+lHfAwXj4BVyezM;", "From": "Stefan Metzmacher <metze@samba.org>", "To": "linux-cifs@vger.kernel.org,\n\tsamba-technical@lists.samba.org", "Cc": "metze@samba.org,\n\tLinus Torvalds <torvalds@linux-foundation.org>,\n\tSteve French <smfrench@gmail.com>,\n\tTom Talpey <tom@talpey.com>,\n\tLong Li <longli@microsoft.com>,\n\tNamjae Jeon <linkinjeon@kernel.org>", "Subject": "[PATCH] smb: smbdirect: move fs/smb/common/smbdirect/ to\n fs/smb/smbdirect/", "Date": "Sun, 19 Apr 2026 21:20:18 +0200", "Message-ID": "<20260419192018.3046449-1-metze@samba.org>", "X-Mailer": "git-send-email 2.43.0", "Precedence": "bulk", "X-Mailing-List": "linux-cifs@vger.kernel.org", "List-Id": "<linux-cifs.vger.kernel.org>", "List-Subscribe": "<mailto:linux-cifs+subscribe@vger.kernel.org>", "List-Unsubscribe": "<mailto:linux-cifs+unsubscribe@vger.kernel.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit" }, "content": "This also removes the smbdirect_ prefix from the files.\n\nSuggested-by: Linus Torvalds <torvalds@linux-foundation.org>\nLink: https://lore.kernel.org/linux-cifs/CAHk-=whmue3PVi88K0UZLZO0at22QhQZ-yu+qO2TOKyZpGqecw@mail.gmail.com/\nCc: Steve French <smfrench@gmail.com>\nCc: Tom Talpey <tom@talpey.com>\nCc: Long Li <longli@microsoft.com>\nCc: Namjae Jeon <linkinjeon@kernel.org>\nCc: Linus Torvalds <torvalds@linux-foundation.org>\nCc: linux-cifs@vger.kernel.org\nCc: samba-technical@lists.samba.org\nSigned-off-by: Stefan Metzmacher <metze@samba.org>\n---\n MAINTAINERS | 2 +-\n fs/smb/Kconfig | 2 +-\n fs/smb/Makefile | 1 +\n fs/smb/client/Kconfig | 2 +-\n fs/smb/client/smbdirect.c | 2 +-\n fs/smb/client/smbdirect.h | 2 +-\n fs/smb/common/Makefile | 1 -\n fs/smb/common/smbdirect/Makefile | 18 ------------------\n fs/smb/server/Kconfig | 2 +-\n fs/smb/server/transport_rdma.c | 2 +-\n fs/smb/server/transport_rdma.h | 2 +-\n fs/smb/{common => }/smbdirect/Kconfig | 2 +-\n fs/smb/smbdirect/Makefile | 18 ++++++++++++++++++\n .../smbdirect_accept.c => smbdirect/accept.c} | 4 ++--\n .../connect.c} | 4 ++--\n .../connection.c} | 2 +-\n .../smbdirect_debug.c => smbdirect/debug.c} | 2 +-\n .../devices.c} | 2 +-\n .../internal.h} | 6 +++---\n .../smbdirect_listen.c => smbdirect/listen.c} | 2 +-\n .../smbdirect_main.c => smbdirect/main.c} | 2 +-\n .../smbdirect_mr.c => smbdirect/mr.c} | 2 +-\n .../smbdirect_pdu.h => smbdirect/pdu.h} | 0\n .../smbdirect_public.h => smbdirect/public.h} | 0\n .../smbdirect_rw.c => smbdirect/rw.c} | 2 +-\n fs/smb/{common => }/smbdirect/smbdirect.h | 0\n .../smbdirect_socket.c => smbdirect/socket.c} | 2 +-\n .../smbdirect_socket.h => smbdirect/socket.h} | 0\n 28 files changed, 43 insertions(+), 43 deletions(-)\n delete mode 100644 fs/smb/common/smbdirect/Makefile\n rename fs/smb/{common => }/smbdirect/Kconfig (86%)\n create mode 100644 fs/smb/smbdirect/Makefile\n rename fs/smb/{common/smbdirect/smbdirect_accept.c => smbdirect/accept.c} (99%)\n rename fs/smb/{common/smbdirect/smbdirect_connect.c => smbdirect/connect.c} (99%)\n rename fs/smb/{common/smbdirect/smbdirect_connection.c => smbdirect/connection.c} (99%)\n rename fs/smb/{common/smbdirect/smbdirect_debug.c => smbdirect/debug.c} (98%)\n rename fs/smb/{common/smbdirect/smbdirect_devices.c => smbdirect/devices.c} (99%)\n rename fs/smb/{common/smbdirect/smbdirect_internal.h => smbdirect/internal.h} (98%)\n rename fs/smb/{common/smbdirect/smbdirect_listen.c => smbdirect/listen.c} (99%)\n rename fs/smb/{common/smbdirect/smbdirect_main.c => smbdirect/main.c} (99%)\n rename fs/smb/{common/smbdirect/smbdirect_mr.c => smbdirect/mr.c} (99%)\n rename fs/smb/{common/smbdirect/smbdirect_pdu.h => smbdirect/pdu.h} (100%)\n rename fs/smb/{common/smbdirect/smbdirect_public.h => smbdirect/public.h} (100%)\n rename fs/smb/{common/smbdirect/smbdirect_rw.c => smbdirect/rw.c} (99%)\n rename fs/smb/{common => }/smbdirect/smbdirect.h (100%)\n rename fs/smb/{common/smbdirect/smbdirect_socket.c => smbdirect/socket.c} (99%)\n rename fs/smb/{common/smbdirect/smbdirect_socket.h => smbdirect/socket.h} (100%)", "diff": "diff --git a/MAINTAINERS b/MAINTAINERS\nindex 13f49378b157..ea24891eca5f 100644\n--- a/MAINTAINERS\n+++ b/MAINTAINERS\n@@ -24613,7 +24613,7 @@ L:\tlinux-cifs@vger.kernel.org\n L:\tsamba-technical@lists.samba.org (moderated for non-subscribers)\n S:\tMaintained\n F:\tfs/smb/client/smbdirect.*\n-F:\tfs/smb/common/smbdirect/\n+F:\tfs/smb/smbdirect/\n F:\tfs/smb/server/transport_rdma.*\n \n SMC91x ETHERNET DRIVER\ndiff --git a/fs/smb/Kconfig b/fs/smb/Kconfig\nindex b4b2cfdc2a6b..e549e189ee6a 100644\n--- a/fs/smb/Kconfig\n+++ b/fs/smb/Kconfig\n@@ -4,7 +4,7 @@\n \n source \"fs/smb/client/Kconfig\"\n source \"fs/smb/server/Kconfig\"\n-source \"fs/smb/common/smbdirect/Kconfig\"\n+source \"fs/smb/smbdirect/Kconfig\"\n \n config SMBFS\n \ttristate\ndiff --git a/fs/smb/Makefile b/fs/smb/Makefile\nindex 9a1bf59a1a65..353b1c2eefc4 100644\n--- a/fs/smb/Makefile\n+++ b/fs/smb/Makefile\n@@ -1,5 +1,6 @@\n # SPDX-License-Identifier: GPL-2.0\n \n obj-$(CONFIG_SMBFS)\t\t+= common/\n+obj-$(CONFIG_SMBDIRECT)\t\t+= smbdirect/\n obj-$(CONFIG_CIFS)\t\t+= client/\n obj-$(CONFIG_SMB_SERVER)\t+= server/\ndiff --git a/fs/smb/client/Kconfig b/fs/smb/client/Kconfig\nindex 63831242fddf..fed621910876 100644\n--- a/fs/smb/client/Kconfig\n+++ b/fs/smb/client/Kconfig\n@@ -182,7 +182,7 @@ config CIFS_SMB_DIRECT\n \tbool \"SMB Direct support\"\n \tdepends on CIFS && INFINIBAND && INFINIBAND_ADDR_TRANS\n \tdepends on CIFS=m || INFINIBAND=y\n-\tselect SMB_COMMON_SMBDIRECT\n+\tselect SMBDIRECT\n \thelp\n \t Enables SMB Direct support for SMB 3.0, 3.02 and 3.1.1.\n \t SMB Direct allows transferring SMB packets over RDMA. If unsure,\ndiff --git a/fs/smb/client/smbdirect.c b/fs/smb/client/smbdirect.c\nindex 9e67adcdc7d3..75f9f91a7ec9 100644\n--- a/fs/smb/client/smbdirect.c\n+++ b/fs/smb/client/smbdirect.c\n@@ -9,7 +9,7 @@\n #include \"cifs_debug.h\"\n #include \"cifsproto.h\"\n #include \"smb2proto.h\"\n-#include \"../common/smbdirect/smbdirect_public.h\"\n+#include \"../smbdirect/public.h\"\n \n /* Port numbers for SMBD transport */\n #define SMB_PORT\t445\ndiff --git a/fs/smb/client/smbdirect.h b/fs/smb/client/smbdirect.h\nindex 0017d5b2de44..287ac849213d 100644\n--- a/fs/smb/client/smbdirect.h\n+++ b/fs/smb/client/smbdirect.h\n@@ -12,7 +12,7 @@\n \n #include \"cifsglob.h\"\n \n-#include \"../common/smbdirect/smbdirect.h\"\n+#include \"../smbdirect/smbdirect.h\"\n \n extern int rdma_readwrite_threshold;\n extern int smbd_max_frmr_depth;\ndiff --git a/fs/smb/common/Makefile b/fs/smb/common/Makefile\nindex e6ee65c31b5d..9e0730a385fb 100644\n--- a/fs/smb/common/Makefile\n+++ b/fs/smb/common/Makefile\n@@ -4,4 +4,3 @@\n #\n \n obj-$(CONFIG_SMBFS) += cifs_md4.o\n-obj-$(CONFIG_SMB_COMMON_SMBDIRECT) += smbdirect/\ndiff --git a/fs/smb/common/smbdirect/Makefile b/fs/smb/common/smbdirect/Makefile\ndeleted file mode 100644\nindex 423f533e1002..000000000000\n--- a/fs/smb/common/smbdirect/Makefile\n+++ /dev/null\n@@ -1,18 +0,0 @@\n-# SPDX-License-Identifier: GPL-2.0-or-later\n-#\n-# Makefile for smbdirect support\n-#\n-\n-obj-$(CONFIG_SMB_COMMON_SMBDIRECT) += smbdirect.o\n-\n-smbdirect-y := \\\n-\tsmbdirect_socket.o\t\\\n-\tsmbdirect_connection.o\t\\\n-\tsmbdirect_mr.o\t\t\\\n-\tsmbdirect_rw.o\t\t\\\n-\tsmbdirect_debug.o\t\\\n-\tsmbdirect_connect.o\t\\\n-\tsmbdirect_listen.o\t\\\n-\tsmbdirect_accept.o\t\\\n-\tsmbdirect_devices.o\t\\\n-\tsmbdirect_main.o\ndiff --git a/fs/smb/server/Kconfig b/fs/smb/server/Kconfig\nindex 37387410e5bb..8f15c5fd6d88 100644\n--- a/fs/smb/server/Kconfig\n+++ b/fs/smb/server/Kconfig\n@@ -49,7 +49,7 @@ config SMB_SERVER_SMBDIRECT\n \tbool \"Support for SMB Direct protocol\"\n \tdepends on SMB_SERVER && INFINIBAND && INFINIBAND_ADDR_TRANS\n \tdepends on SMB_SERVER=m || INFINIBAND=y\n-\tselect SMB_COMMON_SMBDIRECT\n+\tselect SMBDIRECT\n \tdefault n\n \n \thelp\ndiff --git a/fs/smb/server/transport_rdma.c b/fs/smb/server/transport_rdma.c\nindex 706a2c897948..a8242c00096f 100644\n--- a/fs/smb/server/transport_rdma.c\n+++ b/fs/smb/server/transport_rdma.c\n@@ -18,7 +18,7 @@\n #include \"smb_common.h\"\n #include \"../common/smb2status.h\"\n #include \"transport_rdma.h\"\n-#include \"../common/smbdirect/smbdirect_public.h\"\n+#include \"../smbdirect/public.h\"\n \n \n #define SMB_DIRECT_PORT_IWARP\t\t5445\ndiff --git a/fs/smb/server/transport_rdma.h b/fs/smb/server/transport_rdma.h\nindex 05352dc47f95..bde3d88aecc7 100644\n--- a/fs/smb/server/transport_rdma.h\n+++ b/fs/smb/server/transport_rdma.h\n@@ -25,6 +25,6 @@ static inline void init_smbd_max_io_size(unsigned int sz) { }\n static inline unsigned int get_smbd_max_read_write_size(struct ksmbd_transport *kt) { return 0; }\n #endif\n \n-#include \"../common/smbdirect/smbdirect.h\"\n+#include \"../smbdirect/smbdirect.h\"\n \n #endif /* __KSMBD_TRANSPORT_RDMA_H__ */\ndiff --git a/fs/smb/common/smbdirect/Kconfig b/fs/smb/smbdirect/Kconfig\nsimilarity index 86%\nrename from fs/smb/common/smbdirect/Kconfig\nrename to fs/smb/smbdirect/Kconfig\nindex a46a2e6ec87a..2bf1b3350f7d 100644\n--- a/fs/smb/common/smbdirect/Kconfig\n+++ b/fs/smb/smbdirect/Kconfig\n@@ -2,7 +2,7 @@\n #\n # smbdirect configuration\n \n-config SMB_COMMON_SMBDIRECT\n+config SMBDIRECT\n \tdef_tristate n\n \tdepends on INFINIBAND && INFINIBAND_ADDR_TRANS\n \tdepends on m || INFINIBAND=y\ndiff --git a/fs/smb/smbdirect/Makefile b/fs/smb/smbdirect/Makefile\nnew file mode 100644\nindex 000000000000..80d6025984d1\n--- /dev/null\n+++ b/fs/smb/smbdirect/Makefile\n@@ -0,0 +1,18 @@\n+# SPDX-License-Identifier: GPL-2.0-or-later\n+#\n+# Makefile for smbdirect support\n+#\n+\n+obj-$(CONFIG_SMBDIRECT) += smbdirect.o\n+\n+smbdirect-y := \\\n+\tsocket.o\t\\\n+\tconnection.o\t\\\n+\tmr.o\t\t\\\n+\trw.o\t\t\\\n+\tdebug.o\t\t\\\n+\tconnect.o\t\\\n+\tlisten.o\t\\\n+\taccept.o\t\\\n+\tdevices.o\t\\\n+\tmain.o\ndiff --git a/fs/smb/common/smbdirect/smbdirect_accept.c b/fs/smb/smbdirect/accept.c\nsimilarity index 99%\nrename from fs/smb/common/smbdirect/smbdirect_accept.c\nrename to fs/smb/smbdirect/accept.c\nindex d6d5e6a3f5de..704b271af3a8 100644\n--- a/fs/smb/common/smbdirect/smbdirect_accept.c\n+++ b/fs/smb/smbdirect/accept.c\n@@ -5,9 +5,9 @@\n * Copyright (c) 2025, Stefan Metzmacher\n */\n \n-#include \"smbdirect_internal.h\"\n+#include \"internal.h\"\n #include <net/sock.h>\n-#include \"../../common/smb2status.h\"\n+#include \"../common/smb2status.h\"\n \n static int smbdirect_accept_rdma_event_handler(struct rdma_cm_id *id,\n \t\t\t\t\t struct rdma_cm_event *event);\ndiff --git a/fs/smb/common/smbdirect/smbdirect_connect.c b/fs/smb/smbdirect/connect.c\nsimilarity index 99%\nrename from fs/smb/common/smbdirect/smbdirect_connect.c\nrename to fs/smb/smbdirect/connect.c\nindex 2b54f79dba43..8addee43a381 100644\n--- a/fs/smb/common/smbdirect/smbdirect_connect.c\n+++ b/fs/smb/smbdirect/connect.c\n@@ -3,8 +3,8 @@\n * Copyright (c) 2012,2016,2017,2025 Stefan Metzmacher\n */\n \n-#include \"smbdirect_internal.h\"\n-#include \"../../common/smb2status.h\"\n+#include \"internal.h\"\n+#include \"../common/smb2status.h\"\n \n static int smbdirect_connect_setup_connection(struct smbdirect_socket *sc);\n static int smbdirect_connect_resolve_addr(struct smbdirect_socket *sc,\ndiff --git a/fs/smb/common/smbdirect/smbdirect_connection.c b/fs/smb/smbdirect/connection.c\nsimilarity index 99%\nrename from fs/smb/common/smbdirect/smbdirect_connection.c\nrename to fs/smb/smbdirect/connection.c\nindex 7e4921b9538c..822366718d45 100644\n--- a/fs/smb/common/smbdirect/smbdirect_connection.c\n+++ b/fs/smb/smbdirect/connection.c\n@@ -4,7 +4,7 @@\n * Copyright (c) 2025, Stefan Metzmacher\n */\n \n-#include \"smbdirect_internal.h\"\n+#include \"internal.h\"\n #include <linux/folio_queue.h>\n \n struct smbdirect_map_sges {\ndiff --git a/fs/smb/common/smbdirect/smbdirect_debug.c b/fs/smb/smbdirect/debug.c\nsimilarity index 98%\nrename from fs/smb/common/smbdirect/smbdirect_debug.c\nrename to fs/smb/smbdirect/debug.c\nindex d8664fd7f71a..a66a19d4a463 100644\n--- a/fs/smb/common/smbdirect/smbdirect_debug.c\n+++ b/fs/smb/smbdirect/debug.c\n@@ -4,7 +4,7 @@\n * Copyright (c) 2025, Stefan Metzmacher\n */\n \n-#include \"smbdirect_internal.h\"\n+#include \"internal.h\"\n #include <linux/seq_file.h>\n \n void smbdirect_connection_legacy_debug_proc_show(struct smbdirect_socket *sc,\ndiff --git a/fs/smb/common/smbdirect/smbdirect_devices.c b/fs/smb/smbdirect/devices.c\nsimilarity index 99%\nrename from fs/smb/common/smbdirect/smbdirect_devices.c\nrename to fs/smb/smbdirect/devices.c\nindex aaab99e9c045..44962f221c35 100644\n--- a/fs/smb/common/smbdirect/smbdirect_devices.c\n+++ b/fs/smb/smbdirect/devices.c\n@@ -5,7 +5,7 @@\n * Copyright (c) 2025 Stefan Metzmacher\n */\n \n-#include \"smbdirect_internal.h\"\n+#include \"internal.h\"\n \n static u8 smbdirect_ib_device_rdma_capable_node_type(struct ib_device *ib_dev)\n {\ndiff --git a/fs/smb/common/smbdirect/smbdirect_internal.h b/fs/smb/smbdirect/internal.h\nsimilarity index 98%\nrename from fs/smb/common/smbdirect/smbdirect_internal.h\nrename to fs/smb/smbdirect/internal.h\nindex 30a1b8643657..2d5acf2c21bc 100644\n--- a/fs/smb/common/smbdirect/smbdirect_internal.h\n+++ b/fs/smb/smbdirect/internal.h\n@@ -9,8 +9,8 @@\n #define pr_fmt(fmt) KBUILD_MODNAME \": \" fmt\n \n #include \"smbdirect.h\"\n-#include \"smbdirect_pdu.h\"\n-#include \"smbdirect_public.h\"\n+#include \"pdu.h\"\n+#include \"public.h\"\n \n #include <linux/mutex.h>\n \n@@ -34,7 +34,7 @@ struct smbdirect_module_state {\n \n extern struct smbdirect_module_state smbdirect_globals;\n \n-#include \"smbdirect_socket.h\"\n+#include \"socket.h\"\n \n struct smbdirect_device {\n \tstruct list_head list;\ndiff --git a/fs/smb/common/smbdirect/smbdirect_listen.c b/fs/smb/smbdirect/listen.c\nsimilarity index 99%\nrename from fs/smb/common/smbdirect/smbdirect_listen.c\nrename to fs/smb/smbdirect/listen.c\nindex 05c7902e7020..143a7618d95f 100644\n--- a/fs/smb/common/smbdirect/smbdirect_listen.c\n+++ b/fs/smb/smbdirect/listen.c\n@@ -5,7 +5,7 @@\n * Copyright (c) 2025, Stefan Metzmacher\n */\n \n-#include \"smbdirect_internal.h\"\n+#include \"internal.h\"\n \n static int smbdirect_listen_rdma_event_handler(struct rdma_cm_id *id,\n \t\t\t\t\t struct rdma_cm_event *event);\ndiff --git a/fs/smb/common/smbdirect/smbdirect_main.c b/fs/smb/smbdirect/main.c\nsimilarity index 99%\nrename from fs/smb/common/smbdirect/smbdirect_main.c\nrename to fs/smb/smbdirect/main.c\nindex fe6e8d93c34c..606732fefb69 100644\n--- a/fs/smb/common/smbdirect/smbdirect_main.c\n+++ b/fs/smb/smbdirect/main.c\n@@ -3,7 +3,7 @@\n * Copyright (c) 2025, Stefan Metzmacher\n */\n \n-#include \"smbdirect_internal.h\"\n+#include \"internal.h\"\n #include <linux/module.h>\n \n struct smbdirect_module_state smbdirect_globals = {\ndiff --git a/fs/smb/common/smbdirect/smbdirect_mr.c b/fs/smb/smbdirect/mr.c\nsimilarity index 99%\nrename from fs/smb/common/smbdirect/smbdirect_mr.c\nrename to fs/smb/smbdirect/mr.c\nindex fa9be8089925..5228e699cd5d 100644\n--- a/fs/smb/common/smbdirect/smbdirect_mr.c\n+++ b/fs/smb/smbdirect/mr.c\n@@ -4,7 +4,7 @@\n * Copyright (c) 2025, Stefan Metzmacher\n */\n \n-#include \"smbdirect_internal.h\"\n+#include \"internal.h\"\n \n /*\n * Allocate MRs used for RDMA read/write\ndiff --git a/fs/smb/common/smbdirect/smbdirect_pdu.h b/fs/smb/smbdirect/pdu.h\nsimilarity index 100%\nrename from fs/smb/common/smbdirect/smbdirect_pdu.h\nrename to fs/smb/smbdirect/pdu.h\ndiff --git a/fs/smb/common/smbdirect/smbdirect_public.h b/fs/smb/smbdirect/public.h\nsimilarity index 100%\nrename from fs/smb/common/smbdirect/smbdirect_public.h\nrename to fs/smb/smbdirect/public.h\ndiff --git a/fs/smb/common/smbdirect/smbdirect_rw.c b/fs/smb/smbdirect/rw.c\nsimilarity index 99%\nrename from fs/smb/common/smbdirect/smbdirect_rw.c\nrename to fs/smb/smbdirect/rw.c\nindex 3b2eb8c48efc..c2f46b17731e 100644\n--- a/fs/smb/common/smbdirect/smbdirect_rw.c\n+++ b/fs/smb/smbdirect/rw.c\n@@ -5,7 +5,7 @@\n * Copyright (c) 2025, Stefan Metzmacher\n */\n \n-#include \"smbdirect_internal.h\"\n+#include \"internal.h\"\n \n static int smbdirect_connection_wait_for_rw_credits(struct smbdirect_socket *sc,\n \t\t\t\t\t\t int credits)\ndiff --git a/fs/smb/common/smbdirect/smbdirect.h b/fs/smb/smbdirect/smbdirect.h\nsimilarity index 100%\nrename from fs/smb/common/smbdirect/smbdirect.h\nrename to fs/smb/smbdirect/smbdirect.h\ndiff --git a/fs/smb/common/smbdirect/smbdirect_socket.c b/fs/smb/smbdirect/socket.c\nsimilarity index 99%\nrename from fs/smb/common/smbdirect/smbdirect_socket.c\nrename to fs/smb/smbdirect/socket.c\nindex 9153e1dbf53d..1b4ab01b745e 100644\n--- a/fs/smb/common/smbdirect/smbdirect_socket.c\n+++ b/fs/smb/smbdirect/socket.c\n@@ -4,7 +4,7 @@\n * Copyright (c) 2025, Stefan Metzmacher\n */\n \n-#include \"smbdirect_internal.h\"\n+#include \"internal.h\"\n \n bool smbdirect_frwr_is_supported(const struct ib_device_attr *attrs)\n {\ndiff --git a/fs/smb/common/smbdirect/smbdirect_socket.h b/fs/smb/smbdirect/socket.h\nsimilarity index 100%\nrename from fs/smb/common/smbdirect/smbdirect_socket.h\nrename to fs/smb/smbdirect/socket.h\n", "prefixes": [] }