mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-15 15:15:47 +00:00
Code Issues Releases Wiki Activity

Btrfs: Remove noneed force_write in scrub_write_block_to_dev_replace

Browse source 
It is always 1 in this place, because !1 case was already jumped
out in previous code.

Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Chris Mason <clm@fb.com>
This commit is contained in:
Zhao Lei 2015-01-20 15:11:36 +08:00 committed by Chris Mason
parent b25c94c580
commit 114ab50d82
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
fs/btrfs/scrub.c
View file

@ -250,8 +250,7 @@ static void scrub_recheck_block_checksum(struct btrfs_fs_info *fs_info,
const u8 *csum, u64 generation, const u8 *csum, u64 generation,
u16 csum_size); u16 csum_size);
static int scrub_repair_block_from_good_copy(struct scrub_block *sblock_bad, static int scrub_repair_block_from_good_copy(struct scrub_block *sblock_bad,
struct scrub_block *sblock_good, struct scrub_block *sblock_good);
int force_write);
static int scrub_repair_page_from_good_copy(struct scrub_block *sblock_bad, static int scrub_repair_page_from_good_copy(struct scrub_block *sblock_bad,
struct scrub_block *sblock_good, struct scrub_block *sblock_good,
int page_num, int force_write); int page_num, int force_write);
@ -1098,15 +1097,13 @@ static int scrub_handle_errored_block(struct scrub_block *sblock_to_check)
sblock_other->no_io_error_seen) { sblock_other->no_io_error_seen) {
if (sctx->is_dev_replace) { if (sctx->is_dev_replace) {
scrub_write_block_to_dev_replace(sblock_other); scrub_write_block_to_dev_replace(sblock_other);
} else {
int force_write = is_metadata || have_csum;
ret = scrub_repair_block_from_good_copy(
sblock_bad, sblock_other,
force_write);
}
if (0 == ret)
goto corrected_error; goto corrected_error;
} else {
ret = scrub_repair_block_from_good_copy(
sblock_bad, sblock_other);
if (!ret)
goto corrected_error;
}
} }
} }
@ -1619,8 +1616,7 @@ static void scrub_recheck_block_checksum(struct btrfs_fs_info *fs_info,
} }
static int scrub_repair_block_from_good_copy(struct scrub_block *sblock_bad, static int scrub_repair_block_from_good_copy(struct scrub_block *sblock_bad,
struct scrub_block *sblock_good, struct scrub_block *sblock_good)
int force_write)
{ {
int page_num; int page_num;
int ret = 0; int ret = 0;
@ -1630,8 +1626,7 @@ static int scrub_repair_block_from_good_copy(struct scrub_block *sblock_bad,
ret_sub = scrub_repair_page_from_good_copy(sblock_bad, ret_sub = scrub_repair_page_from_good_copy(sblock_bad,
sblock_good, sblock_good,
page_num, page_num, 1);
force_write);
if (ret_sub) if (ret_sub)
ret = ret_sub; ret = ret_sub;
} }