raid5: remove raid5_build_block
Now raid5_build_block is just called to set the sector of r5dev, raid5_compute_blocknr can be used directly for the purpose. Signed-off-by: Guoqing Jiang <gqjiang@suse.com> Signed-off-by: Shaohua Li <shli@fb.com>
This commit is contained in:
Родитель
a72cbf83b0
Коммит
27a4ff8f49
|
@ -494,7 +494,6 @@ static int grow_buffers(struct stripe_head *sh, gfp_t gfp)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void raid5_build_block(struct stripe_head *sh, int i, int previous);
|
||||
static void stripe_set_idx(sector_t stripe, struct r5conf *conf, int previous,
|
||||
struct stripe_head *sh);
|
||||
|
||||
|
@ -530,7 +529,7 @@ retry:
|
|||
WARN_ON(1);
|
||||
}
|
||||
dev->flags = 0;
|
||||
raid5_build_block(sh, i, previous);
|
||||
dev->sector = raid5_compute_blocknr(sh, i, previous);
|
||||
}
|
||||
if (read_seqcount_retry(&conf->gen_lock, seq))
|
||||
goto retry;
|
||||
|
@ -2662,14 +2661,6 @@ static void raid5_end_write_request(struct bio *bi)
|
|||
raid5_release_stripe(sh->batch_head);
|
||||
}
|
||||
|
||||
static void raid5_build_block(struct stripe_head *sh, int i, int previous)
|
||||
{
|
||||
struct r5dev *dev = &sh->dev[i];
|
||||
|
||||
dev->flags = 0;
|
||||
dev->sector = raid5_compute_blocknr(sh, i, previous);
|
||||
}
|
||||
|
||||
static void raid5_error(struct mddev *mddev, struct md_rdev *rdev)
|
||||
{
|
||||
char b[BDEVNAME_SIZE];
|
||||
|
|
Загрузка…
Ссылка в новой задаче