X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-bsp%2Fmeta-sancloud%2Frecipes-kernel%2Flinux%2Flinux-bbe%2F0001-Revert-block-nbd-add-sanity-check-for-first_minor.patch;fp=meta-agl-bsp%2Fmeta-sancloud%2Frecipes-kernel%2Flinux%2Flinux-bbe%2F0001-Revert-block-nbd-add-sanity-check-for-first_minor.patch;h=3b92bc350031b5d1c1599c7283f37e81cfad1f59;hb=a12a83ebdfcd4287264e50edf3b11a156f418ae9;hp=0000000000000000000000000000000000000000;hpb=13a9ec819b88636a11786689a9d39fa0d6a30e68;p=AGL%2Fmeta-agl.git diff --git a/meta-agl-bsp/meta-sancloud/recipes-kernel/linux/linux-bbe/0001-Revert-block-nbd-add-sanity-check-for-first_minor.patch b/meta-agl-bsp/meta-sancloud/recipes-kernel/linux/linux-bbe/0001-Revert-block-nbd-add-sanity-check-for-first_minor.patch new file mode 100644 index 000000000..3b92bc350 --- /dev/null +++ b/meta-agl-bsp/meta-sancloud/recipes-kernel/linux/linux-bbe/0001-Revert-block-nbd-add-sanity-check-for-first_minor.patch @@ -0,0 +1,47 @@ +From 36b3d70d866d6781db4ab4c575b8bdab79244c7f Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Thu, 16 Sep 2021 10:17:11 +0200 +Subject: [PATCH] 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 +Cc: Christoph Hellwig +Cc: Pavel Skripkin +Cc: Jens Axboe +Cc: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/block/nbd.c | 10 ---------- + 1 file changed, 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); +-- +2.34.1 +