diff options
author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2020-09-13 22:54:26 -0700 |
---|---|---|
committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2020-09-13 22:54:26 -0700 |
commit | cde2553115c9f7242a062225ee80bfe7e02e27d7 (patch) | |
tree | ac4c66c39a6045a100e618d148d8c22f189583b1 | |
parent | Checksums (diff) | |
download | linux-cde2553115c9f7242a062225ee80bfe7e02e27d7.tar.xz |
Updated to 5.8.9
-rw-r--r-- | 0003-block-restore-a-specific-error-code-in-bdev_del_partition.patch | 33 | ||||
-rw-r--r-- | PKGBUILD | 7 |
2 files changed, 38 insertions, 2 deletions
diff --git a/0003-block-restore-a-specific-error-code-in-bdev_del_partition.patch b/0003-block-restore-a-specific-error-code-in-bdev_del_partition.patch new file mode 100644 index 0000000..1de46c0 --- /dev/null +++ b/0003-block-restore-a-specific-error-code-in-bdev_del_partition.patch @@ -0,0 +1,33 @@ +From 90b434f4088c347959313d01d46e207a00949f35 Mon Sep 17 00:00:00 2001 +From: Christoph Hellwig <hch@lst.de> +Date: Tue, 8 Sep 2020 16:15:06 +0200 +Subject: block: restore a specific error code in bdev_del_partition + +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> +--- + 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 534e11285a8d..b45539764c99 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); +-- +cgit v1.2.3-1-gf6bb5 + @@ -14,7 +14,7 @@ pkgbase=linux _supver=5 _majver=8 -_minver=8 +_minver=9 _gccpatchver='20200615' _gccpatchger='10.1' _gccpatchker='5.8' @@ -39,6 +39,7 @@ source=( https://www.kernel.org/pub/linux/kernel/v${_supver}.x/${_srcname}.tar.{xz,sign} 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch 0002-virt-vbox-Add-support-for-the-new-VBG_IOCTL_ACQUIRE_.patch + 0003-block-restore-a-specific-error-code-in-bdev_del_partition.patch kernel_gcc_patch-${_gccpatchver}.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/${_gccpatchver}.tar.gz ath9k-regdom-hack.patch raid6-default-algo.patch @@ -50,10 +51,11 @@ validpgpkeys=( '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) # https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -b2sums=('2bd3da156a9e1da58e3fa059accf96c1deeb2e7679aa365b9bc3b11bbdabbad2131d39c611ec0becdbd97399ea5f470634ba45fdb69d514b529c0d8389ce6055' +b2sums=('2c570dde4a870b32d7253b859a9337909043733f09d35990897503a1db3af5ee18b573d057b2b2f90af1b8af02f5c86ba258ec31d4456bf98abde01cbaf2549f' 'SKIP' 'dd8d62b88c0d79eb18b5695b39ca374657b5dd3f5c296a9b262b98e8d0058709b52ad4b56e69afe2fa3db25f944636b8b1eec951e40bd5d02b4127dde6cc4796' 'e54020096951d8e1adb06f524259238fe56922f535f44645d30e4645ac0cb53264afc4840ff77052e3fe8bea4d1a5199d5909041596f0fdfa60203f3ef34248c' + 'cd01b383a1f81b5112a12882f221cb36f3ca22788c29c505630264c92a966649f313518da773cbdcb039d03a84644cea908195be07eb136bca78c215a03a7038' 'c8d0697f99fe6105815217b8ec059d8f587415ea8dd2b88a65e1087feedf697341a64cd56810fde9e7aeada79125fc8235faccc7e7b06492c099e27a8abbe99c' '2e58bb89b247b1678355368956e67c1de51fcde97a227b2162f6771e30f17fa5520faafe7be4b6816a542e7ae10d05f64c6b6354f352c12746d4b8da632936dd' 'fde132f3705d908e6f2147c78a2193289916d72304ca5efa2229d79fc3e57a857314ce94e71425caef2f7f7b6cf87f05ef86335dc8bd4be78e7035afe608005a' @@ -78,6 +80,7 @@ prepare() { echo "Applying hotfixes" patch -p1 -i ../0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch patch -p1 -i ../0002-virt-vbox-Add-support-for-the-new-VBG_IOCTL_ACQUIRE_.patch + patch -p1 -i ../0003-block-restore-a-specific-error-code-in-bdev_del_partition.patch patch -p1 -i ../sphinx-workaround.patch |