diff options
author | Peter Rajnoha <prajnoha@redhat.com> | 2010-08-11 23:13:52 -0400 |
---|---|---|
committer | Alasdair G Kergon <agk@redhat.com> | 2010-08-11 23:13:52 -0400 |
commit | 6be544940109b4c45f560785fe5798ce3fdc1922 (patch) | |
tree | 46307861cfa5d9cc00ba936a0db76aa5feac5226 | |
parent | c24110450650f17f7d3ba4fbe01f01ac5a115456 (diff) |
dm ioctl: remove __dev_status from geometry and target message
Remove useless __dev_status call while processing an ioctl that sets up
device geometry and target message. The data is not returned to
userspace so there is no point collecting it and in the case of
target_message it is collected before processing the message so if it
did return it might be stale.
Signed-off-by: Peter Rajnoha <prajnoha@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
-rw-r--r-- | drivers/md/dm-ioctl.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c index d7500e1c26f2..70f83071e9ab 100644 --- a/drivers/md/dm-ioctl.c +++ b/drivers/md/dm-ioctl.c | |||
@@ -818,8 +818,6 @@ static int dev_set_geometry(struct dm_ioctl *param, size_t param_size) | |||
818 | geometry.start = indata[3]; | 818 | geometry.start = indata[3]; |
819 | 819 | ||
820 | r = dm_set_geometry(md, &geometry); | 820 | r = dm_set_geometry(md, &geometry); |
821 | if (!r) | ||
822 | r = __dev_status(md, param); | ||
823 | 821 | ||
824 | param->data_size = 0; | 822 | param->data_size = 0; |
825 | 823 | ||
@@ -1333,10 +1331,6 @@ static int target_message(struct dm_ioctl *param, size_t param_size) | |||
1333 | if (!md) | 1331 | if (!md) |
1334 | return -ENXIO; | 1332 | return -ENXIO; |
1335 | 1333 | ||
1336 | r = __dev_status(md, param); | ||
1337 | if (r) | ||
1338 | goto out; | ||
1339 | |||
1340 | if (tmsg < (struct dm_target_msg *) param->data || | 1334 | if (tmsg < (struct dm_target_msg *) param->data || |
1341 | invalid_str(tmsg->message, (void *) param + param_size)) { | 1335 | invalid_str(tmsg->message, (void *) param + param_size)) { |
1342 | DMWARN("Invalid target message parameters."); | 1336 | DMWARN("Invalid target message parameters."); |