evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Btrfs: Cleanup unused variant and argument of IO failure handlers

Browse source 
Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Chris Mason <clm@fb.com>
This commit is contained in:
Miao Xie 2014-09-12 18:43:58 +08:00 • committed by Chris Mason
parent 6c387ab20d
commit 454ff3de42
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
fs/btrfs/extent_io.c
View file

@ -1981,8 +1981,7 @@ struct io_failure_record {
int in_validation; int in_validation;
}; };
static int free_io_failure(struct inode *inode, struct io_failure_record *rec, static int free_io_failure(struct inode *inode, struct io_failure_record *rec)
int did_repair)
{ {
int ret; int ret;
int err = 0; int err = 0;
@ -2109,7 +2108,6 @@ static int clean_io_failure(u64 start, struct page *page)
struct btrfs_fs_info *fs_info = BTRFS_I(inode)->root->fs_info; struct btrfs_fs_info *fs_info = BTRFS_I(inode)->root->fs_info;
struct extent_state *state; struct extent_state *state;
int num_copies; int num_copies;
int did_repair = 0;
int ret; int ret;
private = 0; private = 0;
@ -2130,7 +2128,6 @@ static int clean_io_failure(u64 start, struct page *page)
/* there was no real error, just free the record */ /* there was no real error, just free the record */
pr_debug("clean_io_failure: freeing dummy error at %llu\n", pr_debug("clean_io_failure: freeing dummy error at %llu\n",
failrec->start); failrec->start);
did_repair = 1;
goto out; goto out;
} }
if (fs_info->sb->s_flags & MS_RDONLY) if (fs_info->sb->s_flags & MS_RDONLY)
@ -2147,19 +2144,16 @@ static int clean_io_failure(u64 start, struct page *page)
num_copies = btrfs_num_copies(fs_info, failrec->logical, num_copies = btrfs_num_copies(fs_info, failrec->logical,
failrec->len); failrec->len);
if (num_copies > 1) { if (num_copies > 1) {
ret = repair_io_failure(fs_info, start, failrec->len, repair_io_failure(fs_info, start, failrec->len,
failrec->logical, page, failrec->logical, page,
failrec->failed_mirror); failrec->failed_mirror);
did_repair = !ret;
} }
ret = 0;
} }
out: out:
if (!ret) free_io_failure(inode, failrec);
ret = free_io_failure(inode, failrec, did_repair);
return ret; return 0;
} }
/* /*
@ -2269,7 +2263,7 @@ static int bio_readpage_error(struct bio *failed_bio, u64 phy_offset,
*/ */
pr_debug("bio_readpage_error: cannot repair, num_copies=%d, next_mirror %d, failed_mirror %d\n", pr_debug("bio_readpage_error: cannot repair, num_copies=%d, next_mirror %d, failed_mirror %d\n",
num_copies, failrec->this_mirror, failed_mirror); num_copies, failrec->this_mirror, failed_mirror);
free_io_failure(inode, failrec, 0); free_io_failure(inode, failrec);
return -EIO; return -EIO;
} }
@ -2312,13 +2306,13 @@ static int bio_readpage_error(struct bio *failed_bio, u64 phy_offset,
if (failrec->this_mirror > num_copies) { if (failrec->this_mirror > num_copies) {
pr_debug("bio_readpage_error: (fail) num_copies=%d, next_mirror %d, failed_mirror %d\n", pr_debug("bio_readpage_error: (fail) num_copies=%d, next_mirror %d, failed_mirror %d\n",
num_copies, failrec->this_mirror, failed_mirror); num_copies, failrec->this_mirror, failed_mirror);
free_io_failure(inode, failrec, 0); free_io_failure(inode, failrec);
return -EIO; return -EIO;
} }
bio = btrfs_io_bio_alloc(GFP_NOFS, 1); bio = btrfs_io_bio_alloc(GFP_NOFS, 1);
if (!bio) { if (!bio) {
free_io_failure(inode, failrec, 0); free_io_failure(inode, failrec);
return -EIO; return -EIO;
} }
bio->bi_end_io = failed_bio->bi_end_io; bio->bi_end_io = failed_bio->bi_end_io;
@ -2349,7 +2343,7 @@ static int bio_readpage_error(struct bio *failed_bio, u64 phy_offset,
failrec->this_mirror, failrec->this_mirror,
failrec->bio_flags, 0); failrec->bio_flags, 0);
if (ret) { if (ret) {
free_io_failure(inode, failrec, 0); free_io_failure(inode, failrec);
bio_put(bio); bio_put(bio);
} }