Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 647b3d00 authored by Al Viro's avatar Al Viro
Browse files

[PATCH] lose unused arguments in dm ioctl callbacks 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 1bddd9e6

drivers/md/dm-linear.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -110,8 +110,7 @@ static int linear_status(struct dm_target *ti, status_type_t type, 
	return 0;

	return 0;

}

}





static int linear_ioctl(struct dm_target *ti, struct inode *inode,

static int linear_ioctl(struct dm_target *ti, unsigned int cmd,

			struct file *filp, unsigned int cmd,

			unsigned long arg)

			unsigned long arg)

{

{

	struct linear_c *lc = (struct linear_c *) ti->private;

	struct linear_c *lc = (struct linear_c *) ti->private;

drivers/md/dm-mpath.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -1395,8 +1395,7 @@ static int multipath_message(struct dm_target *ti, unsigned argc, char **argv) 
	return -EINVAL;

	return -EINVAL;

}

}





static int multipath_ioctl(struct dm_target *ti, struct inode *inode,

static int multipath_ioctl(struct dm_target *ti, unsigned int cmd,

			   struct file *filp, unsigned int cmd,

			   unsigned long arg)

			   unsigned long arg)

{

{

	struct multipath *m = (struct multipath *) ti->private;

	struct multipath *m = (struct multipath *) ti->private;

drivers/md/dm.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -345,7 +345,7 @@ static int dm_blk_ioctl(struct inode *inode, struct file *file, 
	}

	}





	if (tgt->type->ioctl)

	if (tgt->type->ioctl)

		r = tgt->type->ioctl(tgt, inode, file, cmd, arg);

		r = tgt->type->ioctl(tgt, cmd, arg);





out:

out:

	dm_table_put(map);

	dm_table_put(map);

include/linux/device-mapper.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -69,8 +69,7 @@ typedef int (*dm_status_fn) (struct dm_target *ti, status_type_t status_type, 




typedef int (*dm_message_fn) (struct dm_target *ti, unsigned argc, char **argv);

typedef int (*dm_message_fn) (struct dm_target *ti, unsigned argc, char **argv);





typedef int (*dm_ioctl_fn) (struct dm_target *ti, struct inode *inode,

typedef int (*dm_ioctl_fn) (struct dm_target *ti, unsigned int cmd,

			    struct file *filp, unsigned int cmd,

			    unsigned long arg);

			    unsigned long arg);





typedef int (*dm_merge_fn) (struct dm_target *ti, struct bvec_merge_data *bvm,

typedef int (*dm_merge_fn) (struct dm_target *ti, struct bvec_merge_data *bvm,