Skip to content

Commit

Permalink
dm: do not override error code returned from dm_get_device()
Browse files Browse the repository at this point in the history 
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 <[email protected]>
Signed-off-by: Mike Snitzer <[email protected]>
  • Loading branch information
@rhvgoyal @snitm
rhvgoyal authored and snitm committed Aug 12, 2015
1 parent ab37844 commit e80d1c8
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 19 deletions.
4 changes: 3 additions & 1 deletion drivers/md/dm-crypt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1811,11 +1811,13 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
}
cc->iv_offset = tmpll;

if (dm_get_device(ti, argv[3], dm_table_get_mode(ti->table), &cc->dev)) {
ret = dm_get_device(ti, argv[3], dm_table_get_mode(ti->table), &cc->dev);
if (ret) {
ti->error = "Device lookup failed";
goto bad;
}

ret = -EINVAL;
if (sscanf(argv[4], "%llu%c", &tmpll, &dummy) != 1) {
ti->error = "Invalid device sector";
goto bad;
Expand Down
16 changes: 11 additions & 5 deletions drivers/md/dm-delay.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ static int delay_ctr(struct dm_target *ti, unsigned int argc, char **argv)
struct delay_c *dc;
unsigned long long tmpll;
char dummy;
int ret;

if (argc != 3 && argc != 6) {
ti->error = "requires exactly 3 or 6 arguments";
Expand All @@ -143,6 +144,7 @@ static int delay_ctr(struct dm_target *ti, unsigned int argc, char **argv)

dc->reads = dc->writes = 0;

ret = -EINVAL;
if (sscanf(argv[1], "%llu%c", &tmpll, &dummy) != 1) {
ti->error = "Invalid device sector";
goto bad;
Expand All @@ -154,12 +156,14 @@ static int delay_ctr(struct dm_target *ti, unsigned int argc, char **argv)
goto bad;
}

if (dm_get_device(ti, argv[0], dm_table_get_mode(ti->table),
&dc->dev_read)) {
ret = dm_get_device(ti, argv[0], dm_table_get_mode(ti->table),
&dc->dev_read);
if (ret) {
ti->error = "Device lookup failed";
goto bad;
}

ret = -EINVAL;
dc->dev_write = NULL;
if (argc == 3)
goto out;
Expand All @@ -175,13 +179,15 @@ static int delay_ctr(struct dm_target *ti, unsigned int argc, char **argv)
goto bad_dev_read;
}

if (dm_get_device(ti, argv[3], dm_table_get_mode(ti->table),
&dc->dev_write)) {
ret = dm_get_device(ti, argv[3], dm_table_get_mode(ti->table),
&dc->dev_write);
if (ret) {
ti->error = "Write device lookup failed";
goto bad_dev_read;
}

out:
ret = -EINVAL;
dc->kdelayd_wq = alloc_workqueue("kdelayd", WQ_MEM_RECLAIM, 0);
if (!dc->kdelayd_wq) {
DMERR("Couldn't start kdelayd");
Expand All @@ -208,7 +214,7 @@ static int delay_ctr(struct dm_target *ti, unsigned int argc, char **argv)
dm_put_device(ti, dc->dev_read);
bad:
kfree(dc);
return -EINVAL;
return ret;
}

static void delay_dtr(struct dm_target *ti)
Expand Down
6 changes: 4 additions & 2 deletions drivers/md/dm-flakey.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand All @@ -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)
Expand Down
7 changes: 5 additions & 2 deletions drivers/md/dm-linear.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ static int linear_ctr(struct dm_target *ti, unsigned int argc, char **argv)
struct linear_c *lc;
unsigned long long tmp;
char dummy;
int ret;

if (argc != 2) {
ti->error = "Invalid argument count";
Expand All @@ -42,13 +43,15 @@ static int linear_ctr(struct dm_target *ti, unsigned int argc, char **argv)
return -ENOMEM;
}

ret = -EINVAL;
if (sscanf(argv[1], "%llu%c", &tmp, &dummy) != 1) {
ti->error = "dm-linear: Invalid device sector";
goto bad;
}
lc->start = tmp;

if (dm_get_device(ti, argv[0], dm_table_get_mode(ti->table), &lc->dev)) {
ret = dm_get_device(ti, argv[0], dm_table_get_mode(ti->table), &lc->dev);
if (ret) {
ti->error = "dm-linear: Device lookup failed";
goto bad;
}
Expand All @@ -61,7 +64,7 @@ static int linear_ctr(struct dm_target *ti, unsigned int argc, char **argv)

bad:
kfree(lc);
return -EINVAL;
return ret;
}

static void linear_dtr(struct dm_target *ti)
Expand Down
11 changes: 8 additions & 3 deletions drivers/md/dm-log-writes.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,7 @@ static int log_writes_ctr(struct dm_target *ti, unsigned int argc, char **argv)
struct log_writes_c *lc;
struct dm_arg_set as;
const char *devname, *logdevname;
int ret;

as.argc = argc;
as.argv = argv;
Expand All @@ -443,18 +444,22 @@ static int log_writes_ctr(struct dm_target *ti, unsigned int argc, char **argv)
atomic_set(&lc->pending_blocks, 0);

devname = dm_shift_arg(&as);
if (dm_get_device(ti, devname, dm_table_get_mode(ti->table), &lc->dev)) {
ret = dm_get_device(ti, devname, dm_table_get_mode(ti->table), &lc->dev);
if (ret) {
ti->error = "Device lookup failed";
goto bad;
}

logdevname = dm_shift_arg(&as);
if (dm_get_device(ti, logdevname, dm_table_get_mode(ti->table), &lc->logdev)) {
ret = dm_get_device(ti, logdevname, dm_table_get_mode(ti->table),
&lc->logdev);
if (ret) {
ti->error = "Log device lookup failed";
dm_put_device(ti, lc->dev);
goto bad;
}

ret = -EINVAL;
lc->log_kthread = kthread_run(log_writes_kthread, lc, "log-write");
if (!lc->log_kthread) {
ti->error = "Couldn't alloc kthread";
Expand All @@ -479,7 +484,7 @@ static int log_writes_ctr(struct dm_target *ti, unsigned int argc, char **argv)

bad:
kfree(lc);
return -EINVAL;
return ret;
}

static int log_mark(struct log_writes_c *lc, char *data)
Expand Down
8 changes: 5 additions & 3 deletions drivers/md/dm-raid1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -943,16 +943,18 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
{
unsigned long long offset;
char dummy;
int ret;

if (sscanf(argv[1], "%llu%c", &offset, &dummy) != 1) {
ti->error = "Invalid offset";
return -EINVAL;
}

if (dm_get_device(ti, argv[0], dm_table_get_mode(ti->table),
&ms->mirror[mirror].dev)) {
ret = dm_get_device(ti, argv[0], dm_table_get_mode(ti->table),
&ms->mirror[mirror].dev);
if (ret) {
ti->error = "Device lookup failure";
return -ENXIO;
return ret;
}

ms->mirror[mirror].ms = ms;
Expand Down
8 changes: 5 additions & 3 deletions drivers/md/dm-stripe.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,15 @@ static int get_stripe(struct dm_target *ti, struct stripe_c *sc,
{
unsigned long long start;
char dummy;
int ret;

if (sscanf(argv[1], "%llu%c", &start, &dummy) != 1)
return -EINVAL;

if (dm_get_device(ti, argv[0], dm_table_get_mode(ti->table),
&sc->stripe[stripe].dev))
return -ENXIO;
ret = dm_get_device(ti, argv[0], dm_table_get_mode(ti->table),
&sc->stripe[stripe].dev);
if (ret)
return ret;

sc->stripe[stripe].physical_start = start;

Expand Down

0 comments on commit e80d1c8

Please sign in to comment.