diff options
| author | Linus Torvalds <[email protected]> | 2017-08-24 14:10:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2017-08-24 14:10:31 -0700 |
| commit | b71a5e3fe81c01dbd0b80eab7ae47d4cbd57d72a (patch) | |
| tree | fe8ee359ac7e8c83547ffd29bd940250a384180d /fs/btrfs/disk-io.c | |
| parent | 415be6c256ddb5ef2eccd9f45fc67d73d49f466a (diff) | |
| parent | 58efbc9f5463308c43d812fd0748a4dee44c8a16 (diff) | |
Merge branch 'for-4.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull btrfs fix from David Sterba:
"We have one more fixup that stems from the blk_status_t conversion
that did not quite cover everything.
The normal cases were not affected because the code is 0, but any
error and retries could mix up new and old values"
* 'for-4.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
Btrfs: fix blk_status_t/errno confusion
Diffstat (limited to 'fs/btrfs/disk-io.c')
| -rw-r--r-- | fs/btrfs/disk-io.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 080e2ebb8aa0..f45b61fe9a9a 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -3516,7 +3516,7 @@ static blk_status_t wait_dev_flush(struct btrfs_device *device) struct bio *bio = device->flush_bio; if (!device->flush_bio_sent) - return 0; + return BLK_STS_OK; device->flush_bio_sent = 0; wait_for_completion_io(&device->flush_wait); @@ -3563,7 +3563,7 @@ static int barrier_all_devices(struct btrfs_fs_info *info) continue; write_dev_flush(dev); - dev->last_flush_error = 0; + dev->last_flush_error = BLK_STS_OK; } /* wait for all the barriers */ |