From: Kuniyuki Iwashima <kuniyu@google.com>
To: Josef Bacik <josef@toxicpanda.com>, Jens Axboe <axboe@kernel.dk>,
"David S . Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>
Cc: Simon Horman <horms@kernel.org>,
Kuniyuki Iwashima <kuniyu@google.com>,
Kuniyuki Iwashima <kuni1840@gmail.com>,
linux-block@vger.kernel.org, nbd@other.debian.org,
netdev@vger.kernel.org
Subject: [PATCH 1/5] nbd: Remove redundant sock->ops->shutdown() check in nbd_get_socket().
Date: Wed, 25 Mar 2026 06:38:22 +0000 [thread overview]
Message-ID: <20260325063843.1790782-2-kuniyu@google.com> (raw)
In-Reply-To: <20260325063843.1790782-1-kuniyu@google.com>
Since commit 9f7c02e03157 ("nbd: restrict sockets to TCP
and UDP") (s/UDP/AF_UNIX/), NBD only accepts TCP and AF_UNIX
SOCK_STREAM sockets as backend.
nbd_get_socket() currently checks if sock->ops->shutdown()
is sock_no_shutdown(), but sock->ops->shutdown() is always
inet_shutdown() or unix_shutdown() for these socket types.
Let's remove the redundant check.
Signed-off-by: Kuniyuki Iwashima <kuniyu@google.com>
---
drivers/block/nbd.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index fe63f3c55d0d..fc714cba1f23 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -1228,13 +1228,6 @@ static struct socket *nbd_get_socket(struct nbd_device *nbd, unsigned long fd,
return NULL;
}
- if (sock->ops->shutdown == sock_no_shutdown) {
- dev_err(disk_to_dev(nbd->disk), "Unsupported socket: shutdown callout must be supported.\n");
- *err = -EINVAL;
- sockfd_put(sock);
- return NULL;
- }
-
return sock;
}
--
2.53.0.1018.g2bb0e51243-goog
next prev parent reply other threads:[~2026-03-25 6:38 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-25 6:38 [PATCH 0/5] nbd: Fix deadlock during fs reclaim under lock_sock() Kuniyuki Iwashima
2026-03-25 6:38 ` Kuniyuki Iwashima [this message]
2026-03-25 6:38 ` [PATCH 2/5] nbd: Reject unconnected sockets in nbd_get_socket() Kuniyuki Iwashima
2026-03-25 6:38 ` [PATCH 3/5] net: Introduce lock_sock_try() Kuniyuki Iwashima
2026-03-25 6:38 ` [PATCH 4/5] inet: Add inet_shutdown_locked() Kuniyuki Iwashima
2026-03-25 6:38 ` [PATCH 5/5] nbd: Use lock_sock_try() for TCP sendmsg() and shutdown() Kuniyuki Iwashima
2026-03-26 19:13 ` kernel test robot
2026-03-26 19:38 ` Kuniyuki Iwashima
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260325063843.1790782-2-kuniyu@google.com \
--to=kuniyu@google.com \
--cc=axboe@kernel.dk \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=josef@toxicpanda.com \
--cc=kuba@kernel.org \
--cc=kuni1840@gmail.com \
--cc=linux-block@vger.kernel.org \
--cc=nbd@other.debian.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox