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

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

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.net


Signed-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

fs/autofs4/dev-ioctl.c

+6 −4
Original line number Diff line number Diff line
@@ -705,7 +705,8 @@ static int _autofs_dev_ioctl(unsigned int command, 
	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;
@@ -714,9 +715,10 @@ static long autofs_dev_ioctl(struct file *file, uint command, ulong u) 
}



#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

#define autofs_dev_ioctl_compat NULL