Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.1/patches/2220579/?format=api
{ "id": 2220579, "url": "http://patchwork.ozlabs.org/api/1.1/patches/2220579/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linux-cifs-client/patch/e1972e6f1fda9842c5724b7daf4a2aa7779901a5.1775571957.git.metze@samba.org/", "project": { "id": 12, "url": "http://patchwork.ozlabs.org/api/1.1/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": "" }, "msgid": "<e1972e6f1fda9842c5724b7daf4a2aa7779901a5.1775571957.git.metze@samba.org>", "date": "2026-04-07T14:46:34", "name": "[8/8] smb: server: make use of IPPROTO_SMBDIRECT sockets", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "b6efa3864baf4351b8be955d05e4242c2c3a9ccf", "submitter": { "id": 8149, "url": "http://patchwork.ozlabs.org/api/1.1/people/8149/?format=api", "name": "Stefan Metzmacher", "email": "metze@samba.org" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/linux-cifs-client/patch/e1972e6f1fda9842c5724b7daf4a2aa7779901a5.1775571957.git.metze@samba.org/mbox/", "series": [ { "id": 498990, "url": "http://patchwork.ozlabs.org/api/1.1/series/498990/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linux-cifs-client/list/?series=498990", "date": "2026-04-07T14:46:28", "name": "smb: add kernel internal IPPROTO_SMBDIRECT", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/498990/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2220579/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2220579/checks/", "tags": {}, "headers": { "Return-Path": "\n <linux-cifs+bounces-10697-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=IruX2oPJ;\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-10697-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=\"IruX2oPJ\"", "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)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fqq2g0R4Bz1yD3\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 08 Apr 2026 00:53:47 +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 65945305614D\n\tfor <incoming@patchwork.ozlabs.org>; Tue, 7 Apr 2026 14:48:14 +0000 (UTC)", "from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id 87469327C00;\n\tTue, 7 Apr 2026 14:47:58 +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 3258D30E84D;\n\tTue, 7 Apr 2026 14:47:54 +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 1wA7iZ-00000007WTu-3ZuH;\n\tTue, 07 Apr 2026 14:47:51 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1775573278; cv=none;\n b=JbdjHn9wamrITwOrfkzgKffZ33+mNQp0H/s4c+zNhg4+e0S23DSW4FC41As2K9m5bh0VjXWcOFODIspuijTbz5R7j8TON/Ns/XlJkqG0+Joy0xqHJtutF1w8/W6Q2aDGQfYvW2+bDoTg73TBgS7P693vGoTf+0qWZHL7M046l6M=", "ARC-Message-Signature": "i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1775573278; c=relaxed/simple;\n\tbh=2dq2P+0tdbsbjZz2u/DeRU8PxALkmPrOdEZzk4yADsY=;\n\th=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version;\n b=kCj7D5Pb689rKiKFfJV/5PaB3BPLkmZOfmvU0FXdjlwjy9mGzyM/tqPfon8lmGGO1uqJ2/70allMp9Lspu7EN61vI4YkoMQKKu49/xOxr4t1vgXhpYs12rtAceoYRw7J1u8Ox8jHmYeU1Nph2cpXT57quPHsntajnF/0qexHs3I=", "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=IruX2oPJ; 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=ZZvdJM7m8CwmDYuF3I+bBNMABHxGKhrdyV5j+jSjLAw=; b=IruX2oPJmWUD91PA2Qmj99TRw0\n\tfZ1Hg2rJrtq4sTrTJda7uGgSy8toTHCBd7quynm8ktkEfBsFNP988bkCCRz2q3xZkVXiA5bos/vrw\n\tnkCpNma/IlCmD8bKm2nAe8SKXXomnqx2U0k5t/t1cE83Or/3Rr657+54GGxcSnSgc78L+PBWD45fS\n\tBHf37mKku9NYbi8VfPnwJo7PSSNSwcgMA+Q/QWotfEfngct76DTnkMgu4gol1SAJgmxC1ulq+zamy\n\t6gxEx7RywbcgcxcswXLsJyyKrRCSPTEcBmfrlldEc618j7bCvObONRjPcknrodhYt+n34pMtQ89zV\n\tgLEwySw3R2HtjxVXWWvjindUftapZs6jlFyh9nhZH4a5TNHaHc/QdOhFxHsqcEiuOhl/4x8Lt4SYc\n\tbmwV+d5ioKaSEDXDO8UxKfg8m27oEasmL0BCOwqjv/I6sj4j73kMDnPfY3BnuftHrnB35nmdlJQkg\n\tAdGFm+yJWmfCTaPMTbTPt6hN;", "From": "Stefan Metzmacher <metze@samba.org>", "To": "linux-cifs@vger.kernel.org,\n\tsamba-technical@lists.samba.org", "Cc": "metze@samba.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>,\n\tDavid Howells <dhowells@redhat.com>,\n\tHenrique Carvalho <henrique.carvalho@suse.com>,\n\t\"David S . Miller\" <davem@davemloft.net>,\n\tEric Dumazet <edumazet@google.com>,\n\tJakub Kicinski <kuba@kernel.org>,\n\tPaolo Abeni <pabeni@redhat.com>,\n\tSimon Horman <horms@kernel.org>,\n\tKuniyuki Iwashima <kuniyu@google.com>,\n\tWillem de Bruijn <willemb@google.com>,\n\tnetdev@vger.kernel.org,\n\tXin Long <lucien.xin@gmail.com>,\n\tquic@lists.linux.dev,\n\tlinux-rdma@vger.kernel.org,\n\tlinux-kernel@vger.kernel.org", "Subject": "[PATCH 8/8] smb: server: make use of IPPROTO_SMBDIRECT sockets", "Date": "Tue, 7 Apr 2026 16:46:34 +0200", "Message-ID": "\n <e1972e6f1fda9842c5724b7daf4a2aa7779901a5.1775571957.git.metze@samba.org>", "X-Mailer": "git-send-email 2.43.0", "In-Reply-To": "<cover.1775571957.git.metze@samba.org>", "References": "<cover.1775571957.git.metze@samba.org>", "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 reduces the function calls for special smbdirect features to\n- smbdirect_socket_from_sock()\n- smbdirect_socket_set_logging()\n- smbdirect_socket_set_initial_parameters()\n- smbdirect_socket_set_kernel_settings()\n- smbdirect_socket_get_current_parameters()\n- smbdirect_connection_is_connected()\n- smbdirect_connection_rdma_xmit()\n\nThis will also make it easier to implement the QUIC\ntransport Henrique Carvalho is working on.\n\nIn the end the core smb handling should just make\nuse of a SOCK_STREAM socket, after the initial setup.\n\nThere's still a way to go, but almost all changes\nwill be done within the smbdirect code, e.g.\nadding MSG_SPLICE_PAGES support or\nsplice_read/read_sock/read_skb.\n\nBut it's a good start, which will make changes\nmuch easier.\n\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: David Howells <dhowells@redhat.com>\nCc: Henrique Carvalho <henrique.carvalho@suse.com>\nCc: linux-cifs@vger.kernel.org\nCc: samba-technical@lists.samba.org\nCc: David S. Miller <davem@davemloft.net>\nCc: Eric Dumazet <edumazet@google.com>\nCc: Jakub Kicinski <kuba@kernel.org>\nCc: Paolo Abeni <pabeni@redhat.com>\nCc: Simon Horman <horms@kernel.org>\nCc: Kuniyuki Iwashima <kuniyu@google.com>\nCc: Willem de Bruijn <willemb@google.com>\nCc: netdev@vger.kernel.org\nCc: Xin Long <lucien.xin@gmail.com>\nCc: quic@lists.linux.dev\nCc: linux-rdma@vger.kernel.org\nCc: linux-kernel@vger.kernel.org\nSigned-off-by: Stefan Metzmacher <metze@samba.org>\n---\n fs/smb/server/transport_rdma.c | 119 +++++++++++++++++++--------------\n 1 file changed, 70 insertions(+), 49 deletions(-)", "diff": "diff --git a/fs/smb/server/transport_rdma.c b/fs/smb/server/transport_rdma.c\nindex 706a2c897948..64be48165cda 100644\n--- a/fs/smb/server/transport_rdma.c\n+++ b/fs/smb/server/transport_rdma.c\n@@ -82,13 +82,13 @@ static struct smb_direct_listener {\n \n \tstruct task_struct\t*thread;\n \n-\tstruct smbdirect_socket *socket;\n+\tstruct socket\t\t*sock;\n } smb_direct_ib_listener, smb_direct_iw_listener;\n \n struct smb_direct_transport {\n \tstruct ksmbd_transport\ttransport;\n \n-\tstruct smbdirect_socket *socket;\n+\tstruct socket\t\t*sock;\n };\n \n static bool smb_direct_logging_needed(struct smbdirect_socket *sc,\n@@ -165,18 +165,23 @@ void init_smbd_max_io_size(unsigned int sz)\n unsigned int get_smbd_max_read_write_size(struct ksmbd_transport *kt)\n {\n \tstruct smb_direct_transport *t;\n+\tstruct smbdirect_socket *sc;\n \tconst struct smbdirect_socket_parameters *sp;\n \n \tif (kt->ops != &ksmbd_smb_direct_transport_ops)\n \t\treturn 0;\n \n \tt = SMBD_TRANS(kt);\n-\tsp = smbdirect_socket_get_current_parameters(t->socket);\n+\tsc = smbdirect_socket_from_sock(t->sock);\n+\n+\tif (!smbdirect_connection_is_connected(sc))\n+\t\treturn 0;\n+\tsp = smbdirect_socket_get_current_parameters(sc);\n \n \treturn sp->max_read_write_size;\n }\n \n-static struct smb_direct_transport *alloc_transport(struct smbdirect_socket *sc)\n+static struct smb_direct_transport *alloc_transport(struct socket *client_sock)\n {\n \tstruct smb_direct_transport *t;\n \tstruct ksmbd_conn *conn;\n@@ -184,7 +189,7 @@ static struct smb_direct_transport *alloc_transport(struct smbdirect_socket *sc)\n \tt = kzalloc_obj(*t, KSMBD_DEFAULT_GFP);\n \tif (!t)\n \t\treturn NULL;\n-\tt->socket = sc;\n+\tt->sock = client_sock;\n \n \tconn = ksmbd_conn_alloc();\n \tif (!conn)\n@@ -209,13 +214,13 @@ static void smb_direct_free_transport(struct ksmbd_transport *kt)\n {\n \tstruct smb_direct_transport *t = SMBD_TRANS(kt);\n \n-\tsmbdirect_socket_release(t->socket);\n+\tsock_release(t->sock);\n \tkfree(t);\n }\n \n static void free_transport(struct smb_direct_transport *t)\n {\n-\tsmbdirect_socket_shutdown(t->socket);\n+\tkernel_sock_shutdown(t->sock, SHUT_RDWR);\n \tksmbd_conn_free(KSMBD_TRANS(t)->conn);\n }\n \n@@ -223,7 +228,6 @@ static int smb_direct_read(struct ksmbd_transport *t, char *buf,\n \t\t\t unsigned int size, int unused)\n {\n \tstruct smb_direct_transport *st = SMBD_TRANS(t);\n-\tstruct smbdirect_socket *sc = st->socket;\n \tstruct msghdr msg = { .msg_flags = 0, };\n \tstruct kvec iov = {\n \t\t.iov_base = buf,\n@@ -231,9 +235,7 @@ static int smb_direct_read(struct ksmbd_transport *t, char *buf,\n \t};\n \tint ret;\n \n-\tiov_iter_kvec(&msg.msg_iter, ITER_DEST, &iov, 1, size);\n-\n-\tret = smbdirect_connection_recvmsg(sc, &msg, 0);\n+\tret = kernel_recvmsg(st->sock, &msg, &iov, 1, size, 0);\n \tif (ret == -ERESTARTSYS)\n \t\tret = -EINTR;\n \treturn ret;\n@@ -244,13 +246,14 @@ static int smb_direct_writev(struct ksmbd_transport *t,\n \t\t\t bool need_invalidate, unsigned int remote_key)\n {\n \tstruct smb_direct_transport *st = SMBD_TRANS(t);\n-\tstruct smbdirect_socket *sc = st->socket;\n-\tstruct iov_iter iter;\n+\tstruct msghdr msg = { .msg_flags = MSG_NOSIGNAL, };\n+\tstruct smbdirect_cmsg_buffer cbuffer = { .msg_control = {0, }, };\n+\tu32 _remote_token = remote_key;\n+\tconst u32 *remote_token = need_invalidate ? &_remote_token : NULL;\n \n-\tiov_iter_kvec(&iter, ITER_SOURCE, iov, niovs, buflen);\n+\tsmbdirect_buffer_remote_invalidate_cmsg_prepare(&msg, &cbuffer, remote_token);\n \n-\treturn smbdirect_connection_send_iter(sc, &iter, 0,\n-\t\t\t\t\t need_invalidate, remote_key);\n+\treturn kernel_sendmsg(st->sock, &msg, iov, niovs, buflen);\n }\n \n static int smb_direct_rdma_write(struct ksmbd_transport *t,\n@@ -259,7 +262,10 @@ static int smb_direct_rdma_write(struct ksmbd_transport *t,\n \t\t\t\t unsigned int desc_len)\n {\n \tstruct smb_direct_transport *st = SMBD_TRANS(t);\n-\tstruct smbdirect_socket *sc = st->socket;\n+\tstruct smbdirect_socket *sc = smbdirect_socket_from_sock(st->sock);\n+\n+\tif (!smbdirect_connection_is_connected(sc))\n+\t\treturn -ENOTCONN;\n \n \treturn smbdirect_connection_rdma_xmit(sc, buf, buflen,\n \t\t\t\t\t desc, desc_len, false);\n@@ -271,7 +277,10 @@ static int smb_direct_rdma_read(struct ksmbd_transport *t,\n \t\t\t\tunsigned int desc_len)\n {\n \tstruct smb_direct_transport *st = SMBD_TRANS(t);\n-\tstruct smbdirect_socket *sc = st->socket;\n+\tstruct smbdirect_socket *sc = smbdirect_socket_from_sock(st->sock);\n+\n+\tif (!smbdirect_connection_is_connected(sc))\n+\t\treturn -ENOTCONN;\n \n \treturn smbdirect_connection_rdma_xmit(sc, buf, buflen,\n \t\t\t\t\t desc, desc_len, true);\n@@ -280,7 +289,7 @@ static int smb_direct_rdma_read(struct ksmbd_transport *t,\n static void smb_direct_disconnect(struct ksmbd_transport *t)\n {\n \tstruct smb_direct_transport *st = SMBD_TRANS(t);\n-\tstruct smbdirect_socket *sc = st->socket;\n+\tstruct smbdirect_socket *sc = smbdirect_socket_from_sock(st->sock);\n \n \tksmbd_debug(RDMA, \"Disconnecting sc=%p\\n\", sc);\n \n@@ -290,23 +299,23 @@ static void smb_direct_disconnect(struct ksmbd_transport *t)\n static void smb_direct_shutdown(struct ksmbd_transport *t)\n {\n \tstruct smb_direct_transport *st = SMBD_TRANS(t);\n-\tstruct smbdirect_socket *sc = st->socket;\n+\tstruct smbdirect_socket *sc = smbdirect_socket_from_sock(st->sock);\n \n \tksmbd_debug(RDMA, \"smb-direct shutdown sc=%p\\n\", sc);\n \n-\tsmbdirect_socket_shutdown(sc);\n+\tkernel_sock_shutdown(st->sock, SHUT_RDWR);\n }\n \n static int smb_direct_new_connection(struct smb_direct_listener *listener,\n-\t\t\t\t struct smbdirect_socket *client_sc)\n+\t\t\t\t struct socket *client_sock)\n {\n \tstruct smb_direct_transport *t;\n \tstruct task_struct *handler;\n \tint ret;\n \n-\tt = alloc_transport(client_sc);\n+\tt = alloc_transport(client_sock);\n \tif (!t) {\n-\t\tsmbdirect_socket_release(client_sc);\n+\t\tsock_release(client_sock);\n \t\treturn -ENOMEM;\n \t}\n \n@@ -328,22 +337,21 @@ static int smb_direct_new_connection(struct smb_direct_listener *listener,\n static int smb_direct_listener_kthread_fn(void *p)\n {\n \tstruct smb_direct_listener *listener = (struct smb_direct_listener *)p;\n-\tstruct smbdirect_socket *client_sc = NULL;\n+\tstruct socket *client_sock = NULL;\n \n \twhile (!kthread_should_stop()) {\n-\t\tstruct proto_accept_arg arg = { .err = -EINVAL, };\n-\t\tlong timeo = MAX_SCHEDULE_TIMEOUT;\n+\t\tint ret;\n \n-\t\tif (!listener->socket)\n+\t\tif (!listener->sock)\n \t\t\tbreak;\n-\t\tclient_sc = smbdirect_socket_accept(listener->socket, timeo, &arg);\n-\t\tif (!client_sc && arg.err == -EINVAL)\n+\t\tret = kernel_accept(listener->sock, &client_sock, 0);\n+\t\tif (ret == -EINVAL)\n \t\t\tbreak;\n-\t\tif (!client_sc)\n+\t\tif (ret)\n \t\t\tcontinue;\n \n \t\tksmbd_debug(CONN, \"connect success: accepted new connection\\n\");\n-\t\tsmb_direct_new_connection(listener, client_sc);\n+\t\tsmb_direct_new_connection(listener, client_sock);\n \t}\n \n \tksmbd_debug(CONN, \"releasing socket\\n\");\n@@ -354,8 +362,12 @@ static void smb_direct_listener_destroy(struct smb_direct_listener *listener)\n {\n \tint ret;\n \n-\tif (listener->socket)\n-\t\tsmbdirect_socket_shutdown(listener->socket);\n+\tif (listener->sock) {\n+\t\tret = kernel_sock_shutdown(listener->sock, SHUT_RDWR);\n+\t\tif (ret)\n+\t\t\tpr_err(\"Failed to shutdown socket: %d %1pe\\n\",\n+\t\t\t ret, ERR_PTR(ret));\n+\t}\n \n \tif (listener->thread) {\n \t\tret = kthread_stop(listener->thread);\n@@ -364,9 +376,9 @@ static void smb_direct_listener_destroy(struct smb_direct_listener *listener)\n \t\tlistener->thread = NULL;\n \t}\n \n-\tif (listener->socket) {\n-\t\tsmbdirect_socket_release(listener->socket);\n-\t\tlistener->socket = NULL;\n+\tif (listener->sock) {\n+\t\tsock_release(listener->sock);\n+\t\tlistener->sock = NULL;\n \t}\n \n \tlistener->port = 0;\n@@ -376,6 +388,7 @@ static int smb_direct_listen(struct smb_direct_listener *listener,\n \t\t\t int port)\n {\n \tstruct net *net = current->nsproxy->net_ns;\n+\tstruct socket *ksmbd_socket;\n \tstruct task_struct *kthread;\n \tstruct sockaddr_in sin = {\n \t\t.sin_family\t\t= AF_INET,\n@@ -410,13 +423,21 @@ static int smb_direct_listen(struct smb_direct_listener *listener,\n \t\treturn -ENODEV;\n \t}\n \n-\tret = smbdirect_socket_create_kern(net, &sc);\n+\tret = sock_create_kern(net, PF_INET, SOCK_STREAM, IPPROTO_SMBDIRECT,\n+\t\t\t &ksmbd_socket);\n \tif (ret) {\n-\t\tpr_err(\"smbdirect_socket_create_kern() failed: %d %1pe\\n\",\n+\t\tpr_err(\"Can't create IPPROTO_SMBDIRECT socket: %d %1pe\\n\",\n \t\t ret, ERR_PTR(ret));\n \t\treturn ret;\n \t}\n \n+\tsc = smbdirect_socket_from_sock(ksmbd_socket);\n+\tif (WARN_ON_ONCE(!sc)) {\n+\t\tret = -EINVAL;\n+\t\tpr_err(\"smbdirect_socket_from_sock returned NULL\\n\");\n+\t\tgoto err;\n+\t}\n+\n \t/*\n \t * Create the initial parameters\n \t */\n@@ -450,22 +471,22 @@ static int smb_direct_listen(struct smb_direct_listener *listener,\n \t\tgoto err;\n \t}\n \n-\tret = smbdirect_socket_bind(sc, (struct sockaddr *)&sin);\n+\tret = kernel_bind(ksmbd_socket, (struct sockaddr_unsized *)&sin, sizeof(sin));\n \tif (ret) {\n-\t\tpr_err(\"smbdirect_socket_bind() failed: %d %1pe\\n\",\n+\t\tpr_err(\"Failed to bind IPPROTO_SMBDIRECT socket: %d %1pe\\n\",\n \t\t ret, ERR_PTR(ret));\n \t\tgoto err;\n \t}\n \n-\tret = smbdirect_socket_listen(sc, 10);\n+\tret = kernel_listen(ksmbd_socket, 10);\n \tif (ret) {\n-\t\tpr_err(\"Port[%d] smbdirect_socket_listen() failed: %d %1pe\\n\",\n+\t\tpr_err(\"Port[%d] kernel_listen() error: %d %1pe\\n\",\n \t\t port, ret, ERR_PTR(ret));\n \t\tgoto err;\n \t}\n \n \tlistener->port = port;\n-\tlistener->socket = sc;\n+\tlistener->sock = ksmbd_socket;\n \n \tkthread = kthread_run(smb_direct_listener_kthread_fn,\n \t\t\t listener,\n@@ -489,7 +510,7 @@ int ksmbd_rdma_init(void)\n \tint ret;\n \n \tsmb_direct_ib_listener = smb_direct_iw_listener = (struct smb_direct_listener) {\n-\t\t.socket = NULL,\n+\t\t.sock = NULL,\n \t};\n \n \tret = smb_direct_listen(&smb_direct_ib_listener,\n@@ -499,8 +520,8 @@ int ksmbd_rdma_init(void)\n \t\tgoto err;\n \t}\n \n-\tksmbd_debug(RDMA, \"InfiniBand/RoCEv1/RoCEv2 RDMA listener. socket=%p\\n\",\n-\t\t smb_direct_ib_listener.socket);\n+\tksmbd_debug(RDMA, \"InfiniBand/RoCEv1/RoCEv2 RDMA listener. sock=%p\\n\",\n+\t\t smb_direct_ib_listener.sock);\n \n \tret = smb_direct_listen(&smb_direct_iw_listener,\n \t\t\t\tSMB_DIRECT_PORT_IWARP);\n@@ -509,8 +530,8 @@ int ksmbd_rdma_init(void)\n \t\tgoto err;\n \t}\n \n-\tksmbd_debug(RDMA, \"iWarp RDMA listener. socket=%p\\n\",\n-\t\t smb_direct_iw_listener.socket);\n+\tksmbd_debug(RDMA, \"iWarp RDMA listener. sock=%p\\n\",\n+\t\t smb_direct_iw_listener.sock);\n \n \treturn 0;\n err:\n", "prefixes": [ "8/8" ] }