1 From 36b3d70d866d6781db4ab4c575b8bdab79244c7f Mon Sep 17 00:00:00 2001
2 From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
3 Date: Thu, 16 Sep 2021 10:17:11 +0200
4 Subject: [PATCH] Revert "block: nbd: add sanity check for first_minor"
6 This reverts commit 4b21d4e820bb9a1415ec76dfe565e4c5937337dd which is
7 commit b1a811633f7321cf1ae2bb76a66805b7720e44c9 upstream.
9 The backport of this is reported to be causing some problems, so revert
10 this for now until they are worked out.
12 Link: https://lore.kernel.org/r/CACPK8XfUWoOHr-0RwRoYoskia4fbAbZ7DYf5wWBnv6qUnGq18w@mail.gmail.com
13 Reported-by: Joel Stanley <joel@jms.id.au>
14 Cc: Christoph Hellwig <hch@lst.de>
15 Cc: Pavel Skripkin <paskripkin@gmail.com>
16 Cc: Jens Axboe <axboe@kernel.dk>
17 Cc: Sasha Levin <sashal@kernel.org>
18 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
20 drivers/block/nbd.c | 10 ----------
21 1 file changed, 10 deletions(-)
23 diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
24 index 98274ba0701d..59c452fff835 100644
25 --- a/drivers/block/nbd.c
26 +++ b/drivers/block/nbd.c
27 @@ -1759,17 +1759,7 @@ static int nbd_dev_add(int index)
28 refcount_set(&nbd->refs, 1);
29 INIT_LIST_HEAD(&nbd->list);
30 disk->major = NBD_MAJOR;
32 - /* Too big first_minor can cause duplicate creation of
33 - * sysfs files/links, since first_minor will be truncated to
34 - * byte in __device_add_disk().
36 disk->first_minor = index << part_shift;
37 - if (disk->first_minor > 0xff) {
42 disk->fops = &nbd_fops;
43 disk->private_data = nbd;
44 sprintf(disk->disk_name, "nbd%d", index);