diff options
-rw-r--r-- | drivers/md/dm-linear.c | 3 | ||||
-rw-r--r-- | drivers/md/dm-mpath.c | 3 | ||||
-rw-r--r-- | drivers/md/dm.c | 2 | ||||
-rw-r--r-- | include/linux/device-mapper.h | 3 |
4 files changed, 4 insertions, 7 deletions
diff --git a/drivers/md/dm-linear.c b/drivers/md/dm-linear.c index 6449bcdf84ca..fa358385eed3 100644 --- a/drivers/md/dm-linear.c +++ b/drivers/md/dm-linear.c | |||
@@ -110,8 +110,7 @@ static int linear_status(struct dm_target *ti, status_type_t type, | |||
110 | return 0; | 110 | return 0; |
111 | } | 111 | } |
112 | 112 | ||
113 | static int linear_ioctl(struct dm_target *ti, struct inode *inode, | 113 | static int linear_ioctl(struct dm_target *ti, unsigned int cmd, |
114 | struct file *filp, unsigned int cmd, | ||
115 | unsigned long arg) | 114 | unsigned long arg) |
116 | { | 115 | { |
117 | struct linear_c *lc = (struct linear_c *) ti->private; | 116 | struct linear_c *lc = (struct linear_c *) ti->private; |
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c index 9bf3460c5540..c681d5e5f45c 100644 --- a/drivers/md/dm-mpath.c +++ b/drivers/md/dm-mpath.c | |||
@@ -1395,8 +1395,7 @@ error: | |||
1395 | return -EINVAL; | 1395 | return -EINVAL; |
1396 | } | 1396 | } |
1397 | 1397 | ||
1398 | static int multipath_ioctl(struct dm_target *ti, struct inode *inode, | 1398 | static int multipath_ioctl(struct dm_target *ti, unsigned int cmd, |
1399 | struct file *filp, unsigned int cmd, | ||
1400 | unsigned long arg) | 1399 | unsigned long arg) |
1401 | { | 1400 | { |
1402 | struct multipath *m = (struct multipath *) ti->private; | 1401 | struct multipath *m = (struct multipath *) ti->private; |
diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 327de03a5bdf..5f0f4c8bcd3e 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c | |||
@@ -345,7 +345,7 @@ static int dm_blk_ioctl(struct inode *inode, struct file *file, | |||
345 | } | 345 | } |
346 | 346 | ||
347 | if (tgt->type->ioctl) | 347 | if (tgt->type->ioctl) |
348 | r = tgt->type->ioctl(tgt, inode, file, cmd, arg); | 348 | r = tgt->type->ioctl(tgt, cmd, arg); |
349 | 349 | ||
350 | out: | 350 | out: |
351 | dm_table_put(map); | 351 | dm_table_put(map); |
diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h index 3f8d4e763672..a567bbc5293a 100644 --- a/include/linux/device-mapper.h +++ b/include/linux/device-mapper.h | |||
@@ -69,8 +69,7 @@ typedef int (*dm_status_fn) (struct dm_target *ti, status_type_t status_type, | |||
69 | 69 | ||
70 | typedef int (*dm_message_fn) (struct dm_target *ti, unsigned argc, char **argv); | 70 | typedef int (*dm_message_fn) (struct dm_target *ti, unsigned argc, char **argv); |
71 | 71 | ||
72 | typedef int (*dm_ioctl_fn) (struct dm_target *ti, struct inode *inode, | 72 | typedef int (*dm_ioctl_fn) (struct dm_target *ti, unsigned int cmd, |
73 | struct file *filp, unsigned int cmd, | ||
74 | unsigned long arg); | 73 | unsigned long arg); |
75 | 74 | ||
76 | typedef int (*dm_merge_fn) (struct dm_target *ti, struct bvec_merge_data *bvm, | 75 | typedef int (*dm_merge_fn) (struct dm_target *ti, struct bvec_merge_data *bvm, |