Skip to content

Commit 647b3d0

Browse files
author
Al Viro
committed
[PATCH] lose unused arguments in dm ioctl callbacks
Signed-off-by: Al Viro <[email protected]>
1 parent 1bddd9e commit 647b3d0

File tree

4 files changed

+4
-7
lines changed

4 files changed

+4
-7
lines changed

drivers/md/dm-linear.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,7 @@ static int linear_status(struct dm_target *ti, status_type_t type,
110110
return 0;
111111
}
112112

113-
static int linear_ioctl(struct dm_target *ti, struct inode *inode,
114-
struct file *filp, unsigned int cmd,
113+
static int linear_ioctl(struct dm_target *ti, unsigned int cmd,
115114
unsigned long arg)
116115
{
117116
struct linear_c *lc = (struct linear_c *) ti->private;

drivers/md/dm-mpath.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,8 +1395,7 @@ static int multipath_message(struct dm_target *ti, unsigned argc, char **argv)
13951395
return -EINVAL;
13961396
}
13971397

1398-
static int multipath_ioctl(struct dm_target *ti, struct inode *inode,
1399-
struct file *filp, unsigned int cmd,
1398+
static int multipath_ioctl(struct dm_target *ti, unsigned int cmd,
14001399
unsigned long arg)
14011400
{
14021401
struct multipath *m = (struct multipath *) ti->private;

drivers/md/dm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ static int dm_blk_ioctl(struct inode *inode, struct file *file,
345345
}
346346

347347
if (tgt->type->ioctl)
348-
r = tgt->type->ioctl(tgt, inode, file, cmd, arg);
348+
r = tgt->type->ioctl(tgt, cmd, arg);
349349

350350
out:
351351
dm_table_put(map);

include/linux/device-mapper.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,7 @@ typedef int (*dm_status_fn) (struct dm_target *ti, status_type_t status_type,
6969

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

72-
typedef int (*dm_ioctl_fn) (struct dm_target *ti, struct inode *inode,
73-
struct file *filp, unsigned int cmd,
72+
typedef int (*dm_ioctl_fn) (struct dm_target *ti, unsigned int cmd,
7473
unsigned long arg);
7574

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

0 commit comments

Comments
 (0)