summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-09-16 11:17:11 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-09-16 13:51:23 +0300
commit0daa75bf750c400af0a0127fae37cd959d36dee7 (patch)
tree0969d82024abb0438b9d06fd28841db838cae712
parentd3c3f4e07826acf1ddcdca44057927e3a1ca3072 (diff)
downloadlinux-0daa75bf750c400af0a0127fae37cd959d36dee7.tar.xz
Revert "block: nbd: add sanity check for first_minor"
This reverts commit 4b21d4e820bb9a1415ec76dfe565e4c5937337dd which is commit b1a811633f7321cf1ae2bb76a66805b7720e44c9 upstream. The backport of this is reported to be causing some problems, so revert this for now until they are worked out. Link: https://lore.kernel.org/r/CACPK8XfUWoOHr-0RwRoYoskia4fbAbZ7DYf5wWBnv6qUnGq18w@mail.gmail.com Reported-by: Joel Stanley <joel@jms.id.au> Cc: Christoph Hellwig <hch@lst.de> Cc: Pavel Skripkin <paskripkin@gmail.com> Cc: Jens Axboe <axboe@kernel.dk> Cc: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/block/nbd.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 98274ba0701d..59c452fff835 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -1759,17 +1759,7 @@ static int nbd_dev_add(int index)
refcount_set(&nbd->refs, 1);
INIT_LIST_HEAD(&nbd->list);
disk->major = NBD_MAJOR;
-
- /* Too big first_minor can cause duplicate creation of
- * sysfs files/links, since first_minor will be truncated to
- * byte in __device_add_disk().
- */
disk->first_minor = index << part_shift;
- if (disk->first_minor > 0xff) {
- err = -EINVAL;
- goto out_free_idr;
- }
-
disk->fops = &nbd_fops;
disk->private_data = nbd;
sprintf(disk->disk_name, "nbd%d", index);