From: Peter Rajnoha 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 Signed-off-by: Alasdair G Kergon --- drivers/md/dm-ioctl.c | 6 ------ drivers/md/dm-ioctl.c | 6 ------ 1 file changed, 6 deletions(-) Index: linux-2.6.34/drivers/md/dm-ioctl.c =================================================================== --- linux-2.6.34.orig/drivers/md/dm-ioctl.c +++ linux-2.6.34/drivers/md/dm-ioctl.c @@ -818,8 +818,6 @@ static int dev_set_geometry(struct dm_io geometry.start = indata[3]; r = dm_set_geometry(md, &geometry); - if (!r) - r = __dev_status(md, param); param->data_size = 0; @@ -1333,10 +1331,6 @@ static int target_message(struct dm_ioct if (!md) return -ENXIO; - r = __dev_status(md, param); - if (r) - goto out; - if (tmsg < (struct dm_target_msg *) param->data || invalid_str(tmsg->message, (void *) param + param_size)) { DMWARN("Invalid target message parameters.");