diff options
| author | Vivek Goyal <vgoyal@redhat.com> | 2015-07-31 09:20:36 -0400 |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2015-08-12 11:32:21 -0400 |
| commit | e80d1c805a3b2f0ad2081369be5dc5deedd5ee59 (patch) | |
| tree | 9e1044dc46f00ac0e2c34f92c6c10189c89f0ce9 /drivers/md/dm-flakey.c | |
| parent | ab37844d6169c2dd6f96e665b07b692ba1a4c180 (diff) | |
| download | linux-e80d1c805a3b2f0ad2081369be5dc5deedd5ee59.tar.gz linux-e80d1c805a3b2f0ad2081369be5dc5deedd5ee59.tar.bz2 linux-e80d1c805a3b2f0ad2081369be5dc5deedd5ee59.zip | |
dm: do not override error code returned from dm_get_device()
Some of the device mapper targets override the error code returned by
dm_get_device() and return either -EINVAL or -ENXIO. There is nothing
gained by this override. It is better to propagate the returned error
code unchanged to caller.
This work was motivated by hitting an issue where the underlying device
was busy but -EINVAL was being returned. After this change we get
-EBUSY instead and it is easier to figure out the problem.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Diffstat (limited to 'drivers/md/dm-flakey.c')
| -rw-r--r-- | drivers/md/dm-flakey.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/md/dm-flakey.c b/drivers/md/dm-flakey.c index b257e46876d3..ffb994527bcf 100644 --- a/drivers/md/dm-flakey.c +++ b/drivers/md/dm-flakey.c @@ -183,6 +183,7 @@ static int flakey_ctr(struct dm_target *ti, unsigned int argc, char **argv) devname = dm_shift_arg(&as); + r = -EINVAL; if (sscanf(dm_shift_arg(&as), "%llu%c", &tmpll, &dummy) != 1) { ti->error = "Invalid device sector"; goto bad; @@ -211,7 +212,8 @@ static int flakey_ctr(struct dm_target *ti, unsigned int argc, char **argv) if (r) goto bad; - if (dm_get_device(ti, devname, dm_table_get_mode(ti->table), &fc->dev)) { + r = dm_get_device(ti, devname, dm_table_get_mode(ti->table), &fc->dev); + if (r) { ti->error = "Device lookup failed"; goto bad; } @@ -224,7 +226,7 @@ static int flakey_ctr(struct dm_target *ti, unsigned int argc, char **argv) bad: kfree(fc); - return -EINVAL; + return r; } static void flakey_dtr(struct dm_target *ti) |