Linux 5.1.20

[thirdparty/kernel/stable-queue.git] / queue-5.1 / bcache-fix-mistaken-sysfs-entry-for-io_error-counter.patch

diff --git a/queue-5.1/bcache-fix-mistaken-sysfs-entry-for-io_error-counter.patch b/queue-5.1/bcache-fix-mistaken-sysfs-entry-for-io_error-counter.patch
deleted file mode 100644 (file)
index f215b69..0000000
--- a/queue-5.1/bcache-fix-mistaken-sysfs-entry-for-io_error-counter.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 5461999848e0462c14f306a62923d22de820a59c Mon Sep 17 00:00:00 2001
-From: Coly Li <colyli@suse.de>
-Date: Fri, 28 Jun 2019 19:59:43 +0800
-Subject: bcache: fix mistaken sysfs entry for io_error counter
-
-From: Coly Li <colyli@suse.de>
-
-commit 5461999848e0462c14f306a62923d22de820a59c upstream.
-
-In bch_cached_dev_files[] from driver/md/bcache/sysfs.c, sysfs_errors is
-incorrectly inserted in. The correct entry should be sysfs_io_errors.
-
-This patch fixes the problem and now I/O errors of cached device can be
-read from /sys/block/bcache<N>/bcache/io_errors.
-
-Fixes: c7b7bd07404c5 ("bcache: add io_disable to struct cached_dev")
-Signed-off-by: Coly Li <colyli@suse.de>
-Cc: stable@vger.kernel.org
-Signed-off-by: Jens Axboe <axboe@kernel.dk>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/md/bcache/sysfs.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/md/bcache/sysfs.c
-+++ b/drivers/md/bcache/sysfs.c
-@@ -180,7 +180,7 @@ SHOW(__bch_cached_dev)
-       var_print(writeback_percent);
-       sysfs_hprint(writeback_rate,
-                    wb ? atomic_long_read(&dc->writeback_rate.rate) << 9 : 0);
--      sysfs_hprint(io_errors,         atomic_read(&dc->io_errors));
-+      sysfs_printf(io_errors,         "%i", atomic_read(&dc->io_errors));
-       sysfs_printf(io_error_limit,    "%i", dc->error_limit);
-       sysfs_printf(io_disable,        "%i", dc->io_disable);
-       var_print(writeback_rate_update_seconds);
-@@ -464,7 +464,7 @@ static struct attribute *bch_cached_dev_
-       &sysfs_writeback_rate_p_term_inverse,
-       &sysfs_writeback_rate_minimum,
-       &sysfs_writeback_rate_debug,
--      &sysfs_errors,
-+      &sysfs_io_errors,
-       &sysfs_io_error_limit,
-       &sysfs_io_disable,
-       &sysfs_dirty_data,