diff options
| author | Namhyung Kim <namhyung@gmail.com> | 2011-07-18 17:38:51 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2011-07-18 17:38:51 +1000 |
| commit | ffd96e35c16a99fdb490cc5723b8e32135ae5883 (patch) | |
| tree | 0ae71ae96af464f9e2edb60cdcfdc32e5cd92388 | |
| parent | 6ce328462c1145a217ba1f27b882743be1407759 (diff) | |
md/raid5: get rid of duplicated call to bio_data_dir()
In raid5::make_request(), once bio_data_dir(@bi) is detected
it never (and couldn't) be changed. Use the result always.
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: NeilBrown <neilb@suse.de>
| -rw-r--r-- | drivers/md/raid5.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 0f71aa9a07c..71480646a45 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -4014,7 +4014,7 @@ static int make_request(mddev_t *mddev, struct bio * bi) } } - if (bio_data_dir(bi) == WRITE && + if (rw == WRITE && logical_sector >= mddev->suspend_lo && logical_sector < mddev->suspend_hi) { release_stripe(sh); @@ -4032,7 +4032,7 @@ static int make_request(mddev_t *mddev, struct bio * bi) } if (test_bit(STRIPE_EXPANDING, &sh->state) || - !add_stripe_bio(sh, bi, dd_idx, (bi->bi_rw&RW_MASK))) { + !add_stripe_bio(sh, bi, dd_idx, rw)) { /* Stripe is busy expanding or * add failed due to overlap. Flush everything * and wait a while |