drop queue-5.15/block-don-t-add-or-resize-partition-on-the-disk-with-genhd_fl_no_part...

diff --git a/queue-5.15/block-don-t-add-or-resize-partition-on-the-disk-with-genhd_fl_no_part.patch b/queue-5.15/block-don-t-add-or-resize-partition-on-the-disk-with-genhd_fl_no_part.patch
deleted file mode 100644 (file)
index 7da861e..0000000
--- a/queue-5.15/block-don-t-add-or-resize-partition-on-the-disk-with-genhd_fl_no_part.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 1a721de8489fa559ff4471f73c58bb74ac5580d3 Mon Sep 17 00:00:00 2001
-From: Li Lingfeng <lilingfeng3@huawei.com>
-Date: Thu, 31 Aug 2023 15:59:00 +0800
-Subject: block: don't add or resize partition on the disk with GENHD_FL_NO_PART
-
-From: Li Lingfeng <lilingfeng3@huawei.com>
-
-commit 1a721de8489fa559ff4471f73c58bb74ac5580d3 upstream.
-
-Commit a33df75c6328 ("block: use an xarray for disk->part_tbl") remove
-disk_expand_part_tbl() in add_partition(), which means all kinds of
-devices will support extended dynamic `dev_t`.
-However, some devices with GENHD_FL_NO_PART are not expected to add or
-resize partition.
-Fix this by adding check of GENHD_FL_NO_PART before add or resize
-partition.
-
-Fixes: a33df75c6328 ("block: use an xarray for disk->part_tbl")
-Signed-off-by: Li Lingfeng <lilingfeng3@huawei.com>
-Reviewed-by: Christoph Hellwig <hch@lst.de>
-Link: https://lore.kernel.org/r/20230831075900.1725842-1-lilingfeng@huaweicloud.com
-Signed-off-by: Jens Axboe <axboe@kernel.dk>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- block/ioctl.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/block/ioctl.c
-+++ b/block/ioctl.c
-@@ -20,6 +20,8 @@ static int blkpg_do_ioctl(struct block_d
-       struct blkpg_partition p;
-       long long start, length;
- 
-+      if (disk->flags & GENHD_FL_NO_PART)
-+              return -EINVAL;
-       if (!capable(CAP_SYS_ADMIN))
-               return -EACCES;
-       if (copy_from_user(&p, upart, sizeof(struct blkpg_partition)))

diff --git a/queue-5.15/series b/queue-5.15/series
index 886742464b1e3236bda00959f336856e2dad90d0..30addc63ea4c28d610322343fcf7e7b92c084fa6 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -350,7 +350,6 @@ ntb-drop-packets-when-qp-link-is-down.patch
 ntb-clean-up-tx-tail-index-on-link-down.patch
 ntb-fix-calculation-ntb_transport_tx_free_entry.patch
 revert-pci-mark-nvidia-t4-gpus-to-avoid-bus-reset.patch
-block-don-t-add-or-resize-partition-on-the-disk-with-genhd_fl_no_part.patch
 procfs-block-chmod-on-proc-thread-self-comm.patch
 parisc-fix-proc-cpuinfo-output-for-lscpu.patch
 bpf-fix-issue-in-verifying-allow_ptr_leaks.patch