Commit b9fa2ad1 authored by Tomohiro Kusumi's avatar Tomohiro Kusumi Committed by Linus Torvalds

autofs: use unsigned int/long instead of uint/ulong for ioctl args

The standard types unsigned int and unsigned long should be used for
.compat_ioctl.  autofs is the only fs using uing/ulong for this, and these
are even the only uint/ulong in the entire autofs code.

Drop unneeded long cast in return value of autofs_dev_ioctl_compat().
It's already long.

Link: http://lkml.kernel.org/r/150285069709.4670.3884827966280147529.stgit@pluto.themaw.netSigned-off-by: default avatarTomohiro Kusumi <tkusumi@tuxera.com>
Signed-off-by: default avatarIan Kent <raven@themaw.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7ed1da84
...@@ -93,7 +93,7 @@ static int check_dev_ioctl_version(int cmd, struct autofs_dev_ioctl *param) ...@@ -93,7 +93,7 @@ static int check_dev_ioctl_version(int cmd, struct autofs_dev_ioctl *param)
* at the end of the struct. * at the end of the struct.
*/ */
static struct autofs_dev_ioctl * static struct autofs_dev_ioctl *
copy_dev_ioctl(struct autofs_dev_ioctl __user *in) copy_dev_ioctl(struct autofs_dev_ioctl __user *in)
{ {
struct autofs_dev_ioctl tmp, *res; struct autofs_dev_ioctl tmp, *res;
...@@ -705,7 +705,8 @@ static int _autofs_dev_ioctl(unsigned int command, ...@@ -705,7 +705,8 @@ static int _autofs_dev_ioctl(unsigned int command,
return err; return err;
} }
static long autofs_dev_ioctl(struct file *file, uint command, ulong u) static long autofs_dev_ioctl(struct file *file, unsigned int command,
unsigned long u)
{ {
int err; int err;
...@@ -714,9 +715,10 @@ static long autofs_dev_ioctl(struct file *file, uint command, ulong u) ...@@ -714,9 +715,10 @@ static long autofs_dev_ioctl(struct file *file, uint command, ulong u)
} }
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
static long autofs_dev_ioctl_compat(struct file *file, uint command, ulong u) static long autofs_dev_ioctl_compat(struct file *file, unsigned int command,
unsigned long u)
{ {
return (long) autofs_dev_ioctl(file, command, (ulong) compat_ptr(u)); return autofs_dev_ioctl(file, command, (unsigned long) compat_ptr(u));
} }
#else #else
#define autofs_dev_ioctl_compat NULL #define autofs_dev_ioctl_compat NULL
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment