The patch titled
Subject: autofs: use unsigned int/long instead of uint/ulong for ioctl args
has been removed from the -mm tree. Its filename was
autofs-use-unsigned-int-long-instead-of-uint-ulong-for-ioctl-args.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Tomohiro Kusumi <tkusumi@xxxxxxxxxx>
Subject: 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@xxxxxxxxxxxxxxxx
Signed-off-by: Tomohiro Kusumi <tkusumi@xxxxxxxxxx>
Signed-off-by: Ian Kent <raven@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/autofs4/dev-ioctl.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff -puN fs/autofs4/dev-ioctl.c~autofs-use-unsigned-int-long-instead-of-uint-ulong-for-ioctl-args fs/autofs4/dev-ioctl.c
--- a/fs/autofs4/dev-ioctl.c~autofs-use-unsigned-int-long-instead-of-uint-ulong-for-ioctl-args
+++ a/fs/autofs4/dev-ioctl.c
@@ -93,7 +93,7 @@ static int check_dev_ioctl_version(int c
* at the end of the struct.
*/
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;
@@ -705,7 +705,8 @@ out:
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
}
#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
_
Patches currently in -mm which might be from tkusumi@xxxxxxxxxx are
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
