From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 21 Jan 2019 14:27:32 +0000 (+0100)
Subject: 4.19-stable patches
X-Git-Tag: v4.20.4~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=167dc6daff80547842d1c9979ffbd56ebcf8429c;p=thirdparty%2Fkernel%2Fstable-queue.git

4.19-stable patches

added patches:
	nbd-use-set_blocksize-to-set-device-blocksize.patch
---

diff --git a/queue-4.19/nbd-use-set_blocksize-to-set-device-blocksize.patch b/queue-4.19/nbd-use-set_blocksize-to-set-device-blocksize.patch
new file mode 100644
index 00000000000..9ec72b11d8d
--- /dev/null
+++ b/queue-4.19/nbd-use-set_blocksize-to-set-device-blocksize.patch
@@ -0,0 +1,37 @@
+From c8a83a6b54d0ca078de036aafb3f6af58c1dc5eb Mon Sep 17 00:00:00 2001
+From: Jan Kara <jack@suse.cz>
+Date: Mon, 14 Jan 2019 09:48:09 +0100
+Subject: nbd: Use set_blocksize() to set device blocksize
+
+From: Jan Kara <jack@suse.cz>
+
+commit c8a83a6b54d0ca078de036aafb3f6af58c1dc5eb upstream.
+
+NBD can update block device block size implicitely through
+bd_set_size(). Make it explicitely set blocksize with set_blocksize() as
+this behavior of bd_set_size() is going away.
+
+CC: Josef Bacik <jbacik@fb.com>
+Signed-off-by: Jan Kara <jack@suse.cz>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/block/nbd.c |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/drivers/block/nbd.c
++++ b/drivers/block/nbd.c
+@@ -288,9 +288,10 @@ static void nbd_size_update(struct nbd_d
+ 	blk_queue_physical_block_size(nbd->disk->queue, config->blksize);
+ 	set_capacity(nbd->disk, config->bytesize >> 9);
+ 	if (bdev) {
+-		if (bdev->bd_disk)
++		if (bdev->bd_disk) {
+ 			bd_set_size(bdev, config->bytesize);
+-		else
++			set_blocksize(bdev, config->blksize);
++		} else
+ 			bdev->bd_invalidated = 1;
+ 		bdput(bdev);
+ 	}
diff --git a/queue-4.19/series b/queue-4.19/series
index 6d0306b8447..e9104c3444d 100644
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -98,3 +98,4 @@ loop-drop-caches-if-offset-or-block_size-are-changed.patch
 drm-fb-helper-ignore-the-value-of-fb_var_screeninfo.pixclock.patch
 selftests-fix-test-errors-related-to-lib.mk-khdr-target.patch
 media-vb2-be-sure-to-unlock-mutex-on-errors.patch
+nbd-use-set_blocksize-to-set-device-blocksize.patch