Fix error code in bdev_del_part (rhbz 1878858)

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>

block-restore-a-specific-error-code-in-bdev_del_part.patch

@@ -0,0 +1,38 @@
+From 10b34a18180269103dafc68f1a4257ae61c87415 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Tue, 8 Sep 2020 16:15:06 +0200
+Subject: block: restore a specific error code in bdev_del_partition
+
+From: Christoph Hellwig <hch@lst.de>
+
+[ Upstream commit 88ce2a530cc9865a894454b2e40eba5957a60e1a ]
+
+mdadm relies on the fact that deleting an invalid partition returns
+-ENXIO or -ENOTTY to detect if a block device is a partition or a
+whole device.
+
+Fixes: 08fc1ab6d748 ("block: fix locking in bdev_del_partition")
+Reported-by: kernel test robot <rong.a.chen@intel.com>
+Signed-off-by: Christoph Hellwig <hch@lst.de>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ block/partitions/core.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/block/partitions/core.c b/block/partitions/core.c
+index 534e11285a8d4..b45539764c994 100644
+--- a/block/partitions/core.c
++++ b/block/partitions/core.c
+@@ -529,7 +529,7 @@ int bdev_del_partition(struct block_device *bdev, int partno)
+ 
+ 	bdevp = bdget_disk(bdev->bd_disk, partno);
+ 	if (!bdevp)
+-		return -ENOMEM;
++		return -ENXIO;
+ 
+ 	mutex_lock(&bdevp->bd_mutex);
+ 	mutex_lock_nested(&bdev->bd_mutex, 1);
+-- 
+2.25.1
+

kernel.spec

@@ -80,7 +80,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 300
+%global baserelease 301
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -880,6 +880,9 @@ Patch112: memory-tegra-Remove-GPU-from-DRM-IOMMU-group.patch
 # CVE-2020-25211 rhbz 1877571 1877572
 Patch113: netfilter-ctnetlink-add-range-check-for-l3-l4-protonum.patch
 
+# rhbz 1878858
+Patch114: block-restore-a-specific-error-code-in-bdev_del_part.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -2984,6 +2987,9 @@ fi
 #
 #
 %changelog
+* Mon Sep 14 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.8.9-301
+- Fix error code in bdev_del_part (rhbz 1878858)
+
 * Mon Sep 14 08:51:55 CDT 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.8.9-300
 - Linux v5.8.9