| From edf59055b2b832f4a57f6b1787812c368599ce9d Mon Sep 17 00:00:00 2001 |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Date: Thu, 16 Sep 2021 10:17:11 +0200 |
| Subject: Revert "block: nbd: add sanity check for first_minor" |
| |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| 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> |
| --- |
| drivers/block/nbd.c | 10 ---------- |
| 1 file changed, 10 deletions(-) |
| |
| --- 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); |
