]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
bcache: fix mistaken sysfs entry for io_error counter
authorColy Li <colyli@suse.de>
Fri, 28 Jun 2019 11:59:43 +0000 (19:59 +0800)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Wed, 14 Aug 2019 09:18:49 +0000 (11:18 +0200)
BugLink: https://bugs.launchpad.net/bugs/1839036
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>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/md/bcache/sysfs.c

index ac9c286db5491fddf48cdb1046076c50075cf472..1dc2247103aeff57a40debeaa4b7060ac32ec10d 100644 (file)
@@ -138,7 +138,7 @@ SHOW(__bch_cached_dev)
        var_print(writeback_delay);
        var_print(writeback_percent);
        sysfs_hprint(writeback_rate,    dc->writeback_rate.rate << 9);
-       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);
@@ -372,7 +372,7 @@ static struct attribute *bch_cached_dev_files[] = {
        &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,