| From b062962edb086011e94ec4d9eb3f6a6d814f2a8f Mon Sep 17 00:00:00 2001 |
| From: Namhyung Kim <namhyung@gmail.com> |
| Date: Tue, 14 Jun 2011 14:20:19 +1000 |
| Subject: md/raid5: fix FUA request handling in ops_run_io() |
| |
| From: Namhyung Kim <namhyung@gmail.com> |
| |
| commit b062962edb086011e94ec4d9eb3f6a6d814f2a8f upstream. |
| |
| Commit e9c7469bb4f5 ("md: implment REQ_FLUSH/FUA support") |
| introduced R5_WantFUA flag and set rw to WRITE_FUA in that case. |
| However remaining code still checks whether rw is exactly same |
| as WRITE or not, so FUAed-write ends up with being treated as |
| READ. Fix it. |
| |
| This bug has been present since 2.6.37 and the fix is suitable for any |
| -stable kernel since then. It is not clear why this has not caused |
| more problems. |
| |
| Cc: Tejun Heo <tj@kernel.org> |
| Signed-off-by: Namhyung Kim <namhyung@gmail.com> |
| Signed-off-by: NeilBrown <neilb@suse.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/md/raid5.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/md/raid5.c |
| +++ b/drivers/md/raid5.c |
| @@ -446,7 +446,7 @@ static void ops_run_io(struct stripe_hea |
| bi = &sh->dev[i].req; |
| |
| bi->bi_rw = rw; |
| - if (rw == WRITE) |
| + if (rw & WRITE) |
| bi->bi_end_io = raid5_end_write_request; |
| else |
| bi->bi_end_io = raid5_end_read_request; |
| @@ -480,13 +480,13 @@ static void ops_run_io(struct stripe_hea |
| bi->bi_io_vec[0].bv_offset = 0; |
| bi->bi_size = STRIPE_SIZE; |
| bi->bi_next = NULL; |
| - if (rw == WRITE && |
| + if ((rw & WRITE) && |
| test_bit(R5_ReWrite, &sh->dev[i].flags)) |
| atomic_add(STRIPE_SECTORS, |
| &rdev->corrected_errors); |
| generic_make_request(bi); |
| } else { |
| - if (rw == WRITE) |
| + if (rw & WRITE) |
| set_bit(STRIPE_DEGRADED, &sh->state); |
| pr_debug("skip op %ld on disc %d for sector %llu\n", |
| bi->bi_rw, i, (unsigned long long)sh->sector); |
