From aa5c10ab446eba2cf73f0402f56df7b1e500968b Mon Sep 17 00:00:00 2001 From: Namhyung Kim Date: Mon, 18 Jul 2011 17:38:51 +1000 Subject: [PATCH] --- yaml --- r: 260972 b: refs/heads/master c: ffd96e35c16a99fdb490cc5723b8e32135ae5883 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/md/raid5.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3301abd607b0..2bd6b504b2ca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ce328462c1145a217ba1f27b882743be1407759 +refs/heads/master: ffd96e35c16a99fdb490cc5723b8e32135ae5883 diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c index 0f71aa9a07c5..71480646a459 100644 --- a/trunk/drivers/md/raid5.c +++ b/trunk/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