diff options
author | Liu Bo <bo.li.liu@oracle.com> | 2017-07-13 15:00:50 -0700 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2017-07-14 20:42:37 +0200 |
commit | c3cfb656307583ddfea45375c10183737593c195 (patch) | |
tree | 715fc49cc0671fe86c20a33ce636c623113fd14e /fs/btrfs/extent_io.h | |
parent | e8f5b395d5332b5d720d62d33d6e06836392fd85 (diff) | |
download | linux-stable-c3cfb656307583ddfea45375c10183737593c195.tar.gz linux-stable-c3cfb656307583ddfea45375c10183737593c195.tar.bz2 linux-stable-c3cfb656307583ddfea45375c10183737593c195.zip |
Btrfs: fix unexpected return value of bio_readpage_error
With blk_status_t conversion (that are now present in master),
bio_readpage_error() may return 1 as now ->submit_bio_hook() may not set
%ret if it runs without problems.
This fixes that unexpected return value by changing
btrfs_check_repairable() to return a bool instead of updating %ret, and
patch is applicable to both codebases with and without blk_status_t.
Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/extent_io.h')
-rw-r--r-- | fs/btrfs/extent_io.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h index aeafdb35d90b..cfdbb9efaaed 100644 --- a/fs/btrfs/extent_io.h +++ b/fs/btrfs/extent_io.h @@ -539,8 +539,8 @@ void btrfs_free_io_failure_record(struct btrfs_inode *inode, u64 start, u64 end); int btrfs_get_io_failure_record(struct inode *inode, u64 start, u64 end, struct io_failure_record **failrec_ret); -int btrfs_check_repairable(struct inode *inode, struct bio *failed_bio, - struct io_failure_record *failrec, int fail_mirror); +bool btrfs_check_repairable(struct inode *inode, struct bio *failed_bio, + struct io_failure_record *failrec, int fail_mirror); struct bio *btrfs_create_repair_bio(struct inode *inode, struct bio *failed_bio, struct io_failure_record *failrec, struct page *page, int pg_offset, int icsum, |