5.4-stable patches

added patches:
	block-fix-and-cleanup-bio_check_ro.patch

diff --git a/queue-5.4/block-fix-and-cleanup-bio_check_ro.patch b/queue-5.4/block-fix-and-cleanup-bio_check_ro.patch
new file mode 100644 (file)
index 0000000..759b3d3
--- /dev/null
+++ b/queue-5.4/block-fix-and-cleanup-bio_check_ro.patch
@@ -0,0 +1,39 @@
+From 57e95e4670d1126c103305bcf34a9442f49f6d6a Mon Sep 17 00:00:00 2001
+From: Christoph Hellwig <hch@lst.de>
+Date: Fri, 4 Mar 2022 19:00:56 +0100
+Subject: block: fix and cleanup bio_check_ro
+
+From: Christoph Hellwig <hch@lst.de>
+
+commit 57e95e4670d1126c103305bcf34a9442f49f6d6a upstream.
+
+Don't use a WARN_ON when printing a potentially user triggered
+condition.  Also don't print the partno when the block device name
+already includes it, and use the %pg specifier to simplify printing
+the block device name.
+
+Signed-off-by: Christoph Hellwig <hch@lst.de>
+Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
+Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
+Link: https://lore.kernel.org/r/20220304180105.409765-2-hch@lst.de
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Fedor Pchelkin <pchelkin@ispras.ru>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ block/blk-core.c |    5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+--- a/block/blk-core.c
++++ b/block/blk-core.c
+@@ -793,10 +793,7 @@ static inline bool bio_check_ro(struct b
+ 
+               if (op_is_flush(bio->bi_opf) && !bio_sectors(bio))
+                       return false;
+-
+-              WARN_ONCE(1,
+-                     "generic_make_request: Trying to write "
+-                      "to read-only block-device %s (partno %d)\n",
++              pr_warn("Trying to write to read-only block-device %s (partno %d)\n",
+                       bio_devname(bio, b), part->partno);
+               /* Older lvm-tools actually trigger this */
+               return false;

diff --git a/queue-5.4/series b/queue-5.4/series
index 0252979ec0687a6a95aee815d6b1e03d34d90933..c93bb8239d348d9ecaeea69cf0cfdc386bb851d9 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -102,3 +102,4 @@ net-xgene-move-shared-header-file-into-include-linux.patch
 net-mdio-mux-meson-g12a-force-internal-phy-off-on-mu.patch
 revert-input-synaptics-switch-touchpad-on-hp-laptop-15-da3001tu-to-rmi-mode.patch
 nfsd-ensure-knfsd-shuts-down-when-the-nfsd-pseudofs-is-unmounted.patch
+block-fix-and-cleanup-bio_check_ro.patch