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 --- 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