diff options
author | Mikulas Patocka <mpatocka@redhat.com> | 2009-06-22 05:12:26 -0400 |
---|---|---|
committer | Alasdair G Kergon <agk@redhat.com> | 2009-06-22 05:12:26 -0400 |
commit | 51aa322849581f1a73594e48ea0df63f914ee6a2 (patch) | |
tree | 19b3545084700fc36b5a916d71473936628bb062 /drivers/md | |
parent | 5af443a7e1c0864100cc44525a9821aa2a2f4719 (diff) |
dm io: retry after barrier error
If -EOPNOTSUPP was returned and the request was a barrier request, retry it
without barrier.
Retry all regions for now. Barriers are submitted only for one-region requests,
so it doesn't matter. (In the future, retries can be limited to the actual
regions that failed.)
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Diffstat (limited to 'drivers/md')
-rw-r--r-- | drivers/md/dm-io.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/md/dm-io.c b/drivers/md/dm-io.c index a89f41f00757..3a2e6a2f8bdd 100644 --- a/drivers/md/dm-io.c +++ b/drivers/md/dm-io.c | |||
@@ -364,6 +364,7 @@ static int sync_io(struct dm_io_client *client, unsigned int num_regions, | |||
364 | return -EIO; | 364 | return -EIO; |
365 | } | 365 | } |
366 | 366 | ||
367 | retry: | ||
367 | io.error_bits = 0; | 368 | io.error_bits = 0; |
368 | io.eopnotsupp_bits = 0; | 369 | io.eopnotsupp_bits = 0; |
369 | atomic_set(&io.count, 1); /* see dispatch_io() */ | 370 | atomic_set(&io.count, 1); /* see dispatch_io() */ |
@@ -382,6 +383,11 @@ static int sync_io(struct dm_io_client *client, unsigned int num_regions, | |||
382 | } | 383 | } |
383 | set_current_state(TASK_RUNNING); | 384 | set_current_state(TASK_RUNNING); |
384 | 385 | ||
386 | if (io.eopnotsupp_bits && (rw & (1 << BIO_RW_BARRIER))) { | ||
387 | rw &= ~(1 << BIO_RW_BARRIER); | ||
388 | goto retry; | ||
389 | } | ||
390 | |||
385 | if (error_bits) | 391 | if (error_bits) |
386 | *error_bits = io.error_bits; | 392 | *error_bits = io.error_bits; |
387 | 393 | ||