Commit 27238b2b authored by Alasdair G Kergon's avatar Alasdair G Kergon
Browse files

dm ioctl: remove lock_kernel 



Remove lock_kernel() from the device-mapper ioctls - there should
be sufficient internal locking already where required.

Also remove some superfluous casts.

Signed-off-by: default avatarAlasdair G Kergon <agk@redhat.com>
parent b9249e55

drivers/md/dm-ioctl.c

+9 −6
Original line number Original line Diff line number Diff line
@@ -702,7 +702,7 @@ static int dev_rename(struct dm_ioctl *param, size_t param_size) 
	int r;

	int r;

	char *new_name = (char *) param + param->data_start;

	char *new_name = (char *) param + param->data_start;





	if (new_name < (char *) param->data ||

	if (new_name < param->data ||

	    invalid_str(new_name, (void *) param + param_size)) {

	    invalid_str(new_name, (void *) param + param_size)) {

		DMWARN("Invalid new logical volume name supplied.");

		DMWARN("Invalid new logical volume name supplied.");

		return -EINVAL;

		return -EINVAL;
@@ -728,7 +728,7 @@ static int dev_set_geometry(struct dm_ioctl *param, size_t param_size) 
	if (!md)

	if (!md)

		return -ENXIO;

		return -ENXIO;





	if (geostr < (char *) param->data ||

	if (geostr < param->data ||

	    invalid_str(geostr, (void *) param + param_size)) {

	    invalid_str(geostr, (void *) param + param_size)) {

		DMWARN("Invalid geometry supplied.");

		DMWARN("Invalid geometry supplied.");

		goto out;

		goto out;
@@ -1397,13 +1397,11 @@ static int validate_params(uint cmd, struct dm_ioctl *param) 
	return 0;

	return 0;

}

}





static int ctl_ioctl(struct inode *inode, struct file *file,

static int ctl_ioctl(uint command, struct dm_ioctl __user *user)

		     uint command, ulong u)

{

{

	int r = 0;

	int r = 0;

	unsigned int cmd;

	unsigned int cmd;

	struct dm_ioctl *param;

	struct dm_ioctl *param;

	struct dm_ioctl __user *user = (struct dm_ioctl __user *) u;

	ioctl_fn fn = NULL;

	ioctl_fn fn = NULL;

	size_t param_size;

	size_t param_size;
@@ -1471,8 +1469,13 @@ static int ctl_ioctl(struct inode *inode, struct file *file, 
	return r;

	return r;

}

}





static long dm_ctl_ioctl(struct file *file, uint command, ulong u)

{

	return (long)ctl_ioctl(command, (struct dm_ioctl __user *)u);

}



static const struct file_operations _ctl_fops = {

static const struct file_operations _ctl_fops = {

	.ioctl	 = ctl_ioctl,

	.unlocked_ioctl	 = dm_ctl_ioctl,

	.owner	 = THIS_MODULE,

	.owner	 = THIS_MODULE,

};

};