diff options
| author | David Sterba <dsterba@suse.com> | 2017-06-15 16:20:43 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-06-21 19:03:39 +0200 |
| commit | 66b4993e95c17e0ee30f0d72f0d6e00e5c035a98 (patch) | |
| tree | fce92b32f9f89db6d795c4f47646ba8775bfc57f /fs | |
| parent | 2980d5745fa0beeaab4c22e25bea4faa54f7d9f7 (diff) | |
| download | linux-stable-66b4993e95c17e0ee30f0d72f0d6e00e5c035a98.tar.gz linux-stable-66b4993e95c17e0ee30f0d72f0d6e00e5c035a98.tar.bz2 linux-stable-66b4993e95c17e0ee30f0d72f0d6e00e5c035a98.zip | |
btrfs: move dev stats accounting out of wait_dev_flush
We should really just wait in wait_dev_flush and let the caller decide
what to do with the error value.
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/disk-io.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 917e29167580..b6758892874f 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -3512,7 +3512,6 @@ static void write_dev_flush(struct btrfs_device *device) */ static int wait_dev_flush(struct btrfs_device *device) { - int ret = 0; struct bio *bio = device->flush_bio; if (!device->flush_bio_sent) @@ -3521,13 +3520,7 @@ static int wait_dev_flush(struct btrfs_device *device) device->flush_bio_sent = 0; wait_for_completion_io(&device->flush_wait); - if (bio->bi_error) { - ret = bio->bi_error; - btrfs_dev_stat_inc_and_print(device, - BTRFS_DEV_STAT_FLUSH_ERRS); - } - - return ret; + return bio->bi_error; } static int check_barrier_error(struct btrfs_fs_devices *fsdevs) @@ -3586,6 +3579,8 @@ static int barrier_all_devices(struct btrfs_fs_info *info) ret = wait_dev_flush(dev); if (ret) { dev->last_flush_error = ret; + btrfs_dev_stat_inc_and_print(dev, + BTRFS_DEV_STAT_FLUSH_ERRS); errors_wait++; } } |