From eaf040d1beabad3c4ef9a39e0eb09f226a5b1de6 Mon Sep 17 00:00:00 2001
From: Jessica Yu <jeyu@suse.de>
Date: Jun 02 2021 08:21:36 +0000
Subject: Merge branch 'users/ptesarik/SLE15-SP3/for-next' into SLE15-SP3


Pull block layer fix from Petr Tesarik.

---

diff --git a/patches.suse/partitions-ibm-fix-non-dasd-devices b/patches.suse/partitions-ibm-fix-non-dasd-devices
new file mode 100644
index 0000000..83148ef
--- /dev/null
+++ b/patches.suse/partitions-ibm-fix-non-dasd-devices
@@ -0,0 +1,51 @@
+From: Christoph Hellwig <hch@lst.de>
+Date: Wed, 7 Oct 2020 14:40:09 +0200
+Subject: partitions/ibm: fix non-DASD devices
+Git-commit: 7370997d48520ad923e8eb4deb59ebf290396202
+Patch-mainline: v5.9
+References: bsc#1185857 LTC#192526
+
+Don't error out if the dasd_biodasdinfo symbol is not available.
+
+Cc: stable@vger.kernel.org
+Fixes: 26d7e28e3820 ("s390/dasd: remove ioctl_by_bdev calls")
+Reported-by: Christian Borntraeger <borntraeger@de.ibm.com>
+Signed-off-by: Christoph Hellwig <hch@lst.de>
+Tested-by: Christian Borntraeger <borntraeger@de.ibm.com>
+Reviewed-by: Stefan Haberland <sth@linux.ibm.com>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Acked-by: Petr Tesarik <ptesarik@suse.com>
+---
+ block/partitions/ibm.c |    7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+--- a/block/partitions/ibm.c
++++ b/block/partitions/ibm.c
+@@ -305,8 +305,6 @@ int ibm_partition(struct parsed_partitio
+ 	if (!disk->fops->getgeo)
+ 		goto out_exit;
+ 	fn = symbol_get(dasd_biodasdinfo);
+-	if (!fn)
+-		goto out_exit;
+ 	blocksize = bdev_logical_block_size(bdev);
+ 	if (blocksize <= 0)
+ 		goto out_symbol;
+@@ -326,7 +324,7 @@ int ibm_partition(struct parsed_partitio
+ 	geo->start = get_start_sect(bdev);
+ 	if (disk->fops->getgeo(bdev, geo))
+ 		goto out_freeall;
+-	if (fn(disk, info)) {
++	if (!fn || fn(disk, info)) {
+ 		kfree(info);
+ 		info = NULL;
+ 	}
+@@ -370,7 +368,8 @@ out_nolab:
+ out_nogeo:
+ 	kfree(info);
+ out_symbol:
+-	symbol_put(dasd_biodasdinfo);
++	if (fn)
++		symbol_put(dasd_biodasdinfo);
+ out_exit:
+ 	return res;
+ }
diff --git a/series.conf b/series.conf
index 2b0b09d..42768cd 100644
--- a/series.conf
+++ b/series.conf
@@ -42750,6 +42750,7 @@
 	patches.suse/r8169-consider-that-PHY-reset-may-still-be-in-progre.patch
 	patches.suse/macsec-avoid-use-after-free-in-macsec_handle_frame.patch
 	patches.suse/net-usb-qmi_wwan-add-Cellient-MPL200-card.patch
+	patches.suse/partitions-ibm-fix-non-dasd-devices
 	patches.suse/nvme-core-put-ctrl-ref-when-module-ref-get-fail.patch
 	patches.suse/1918-drm-amdgpu-fix-NULL-pointer-dereference-for-Renoir.patch
 	patches.suse/1919-drm-amdgpu-swsmu-fix-ARC-build-errors.patch