diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-06-03 03:38:02 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-06-09 11:27:32 -0400 |
| commit | 846785e6a5725de4f0788e78e101961566a77d2a (patch) | |
| tree | 4dd5c24f6ebb9e4adb4ab920a6bdd99531e1300c /drivers/md/dm-flakey.c | |
| parent | 14ef1e48269dde9b78efe4b112fa78e9ced72bc1 (diff) | |
dm: don't return errnos from ->map
Instead use the special DM_MAPIO_KILL return value to return -EIO just
like we do for the request based path. Note that dm-log-writes returned
-ENOMEM in a few places, which now becomes -EIO instead. No consumer
treats -ENOMEM special so this shouldn't be an issue (and it should
use a mempool to start with to make guaranteed progress).
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/md/dm-flakey.c')
| -rw-r--r-- | drivers/md/dm-flakey.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/dm-flakey.c b/drivers/md/dm-flakey.c index 13305a182611..e8f093b323ce 100644 --- a/drivers/md/dm-flakey.c +++ b/drivers/md/dm-flakey.c | |||
| @@ -321,7 +321,7 @@ static int flakey_map(struct dm_target *ti, struct bio *bio) | |||
| 321 | if (bio_data_dir(bio) == READ) { | 321 | if (bio_data_dir(bio) == READ) { |
| 322 | if (!fc->corrupt_bio_byte && !test_bit(DROP_WRITES, &fc->flags) && | 322 | if (!fc->corrupt_bio_byte && !test_bit(DROP_WRITES, &fc->flags) && |
| 323 | !test_bit(ERROR_WRITES, &fc->flags)) | 323 | !test_bit(ERROR_WRITES, &fc->flags)) |
| 324 | return -EIO; | 324 | return DM_MAPIO_KILL; |
| 325 | goto map_bio; | 325 | goto map_bio; |
| 326 | } | 326 | } |
| 327 | 327 | ||
| @@ -349,7 +349,7 @@ static int flakey_map(struct dm_target *ti, struct bio *bio) | |||
| 349 | /* | 349 | /* |
| 350 | * By default, error all I/O. | 350 | * By default, error all I/O. |
| 351 | */ | 351 | */ |
| 352 | return -EIO; | 352 | return DM_MAPIO_KILL; |
| 353 | } | 353 | } |
| 354 | 354 | ||
| 355 | map_bio: | 355 | map_bio: |
