autofs: remove unused AUTOFS_IOC_EXPIRE_DIRECT/INDIRECT
PATCH 1/3 autofs: remove unused AUTOFS_IOC_EXPIRE_DIRECT/INDIRECT
From: Tomohiro Kusumi <[email protected]>
These are not used by either kernel or userspace, although AUTOFS_IOC_EXPIRE_DIRECT once seems to have been used by userspace in around 2006-2008, which was technically just an alias of the existing ioctl AUTOFS_IOC_EXPIRE_MULTI.
ioctls for autofs are already complicated enough that they could be removed unless these are staying here to be able to compile userspace code of certain period of time from a decade ago.
--- include/uapi/linux/auto_fs4.h | 2 -- 1 file changed, 2 deletions(-)
include/uapi/linux/auto_fs4.h +0 -2
@@ -155,8 +155,6 @@ enum { };#define AUTOFS_IOC_EXPIRE_MULTI _IOW(AUTOFS_IOCTL, AUTOFS_IOC_EXPIRE_MULTI_CMD, int) -#define AUTOFS_IOC_EXPIRE_INDIRECT AUTOFS_IOC_EXPIRE_MULTI -#define AUTOFS_IOC_EXPIRE_DIRECT AUTOFS_IOC_EXPIRE_MULTI#define AUTOFS_IOC_PROTOSUBVER _IOR(AUTOFS_IOCTL, AUTOFS_IOC_PROTOSUBVER_CMD, int)#define AUTOFS_IOC_ASKUMOUNT _IOR(AUTOFS_IOCTL, AUTOFS_IOC_ASKUMOUNT_CMD, int)
Signature · 4 lines
2.9.3 -- To unsubscribe from this list: send the line "unsubscribe autofs" in
PATCH 2/3 autofs: non functional header inclusion cleanup
From: Tomohiro Kusumi <[email protected]>
Having header includes before any macro (without any dependency) simply looks normal. No reason to have these macros in between.
--- fs/autofs4/autofs_i.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
fs/autofs4/autofs_i.h +11 -11
@@ -11,10 +11,21 @@#include <linux/auto_fs4.h> #include <linux/auto_dev-ioctl.h> + +#include <linux/kernel.h> +#include <linux/slab.h> +#include <linux/time.h> +#include <linux/string.h> +#include <linux/wait.h> +#include <linux/sched.h> +#include <linux/mount.h> +#include <linux/namei.h> +#include <linux/uaccess.h> #include <linux/mutex.h> #include <linux/spinlock.h> #include <linux/list.h> #include <linux/completion.h> +#include <asm/current.h> /* This is the range of ioctl() numbers we claim as ours */ #define AUTOFS_IOC_FIRST AUTOFS_IOC_READY
@@ -24,17 +35,6 @@#define AUTOFS_DEV_IOCTL_IOC_COUNT \ (AUTOFS_DEV_IOCTL_ISMOUNTPOINT_CMD - AUTOFS_DEV_IOCTL_VERSION_CMD) -#include <linux/kernel.h> -#include <linux/slab.h> -#include <linux/time.h> -#include <linux/string.h> -#include <linux/wait.h> -#include <linux/sched.h> -#include <linux/mount.h> -#include <linux/namei.h> -#include <asm/current.h> -#include <linux/uaccess.h> -#ifdef pr_fmt#undef pr_fmt#endif
Signature · 4 lines
2.9.3 -- To unsubscribe from this list: send the line "unsubscribe autofs" in
PATCH 3/3 autofs: use AUTOFS_DEV_IOCTL_SIZE
In reply to [email protected]From: Tomohiro Kusumi <[email protected]>
Use a macro which defines misc-dev ioctl parameter size (excluding a path beyond &path[0]) since it's been used to initialize and copy this structure ever since it first appeared in 8d7b48e0 in 2008.
(or simply get rid of this if this is just unnecessary abstraction when all it needs is sizeof(struct autofs_dev_ioctl))
--- fs/autofs4/dev-ioctl.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
fs/autofs4/dev-ioctl.c +7 -7
@@ -97,13 +97,13 @@ static struct autofs_dev_ioctl * {struct autofs_dev_ioctl tmp, *res; -if (copy_from_user (&tmp, in,sizeof (tmp))) +if (copy_from_user (&tmp, in,AUTOFS_DEV_IOCTL_SIZE ))return ERR_PTR (-EFAULT ); -if (tmp.size <sizeof (tmp)) +if (tmp.size <AUTOFS_DEV_IOCTL_SIZE )return ERR_PTR (-EINVAL ); -if (tmp.size > (PATH_MAX +sizeof (tmp))) +if (tmp.size >AUTOFS_DEV_IOCTL_SIZE +PATH_MAX )return ERR_PTR (-ENAMETOOLONG ); res =memdup_user (in, tmp.size);
@@ -133,8 +133,8 @@ static int validate_dev_ioctl(int cmd, struct autofs_dev_ioctl *param) goto out; } -if (param->size >sizeof (*param)) { - err =invalid_str (param->path, param->size -sizeof (*param)); +if (param->size >AUTOFS_DEV_IOCTL_SIZE ) { + err =invalid_str (param->path, param->size -AUTOFS_DEV_IOCTL_SIZE );if (err) { pr_warn( "path string terminator missing for cmd(0x%08x)\n",
@@ -451,7 +451,7 @@ static int autofs_dev_ioctl_requester(struct file *fp,dev_t devid;int err = -ENOENT ; -if (param->size <=sizeof (*param)) { +if (param->size <=AUTOFS_DEV_IOCTL_SIZE ) { err = -EINVAL ; goto out; }
@@ -539,7 +539,7 @@ static int autofs_dev_ioctl_ismountpoint(struct file *fp,unsigned int devid, magic;int err = -ENOENT ; -if (param->size <=sizeof (*param)) { +if (param->size <=AUTOFS_DEV_IOCTL_SIZE ) { err = -EINVAL ; goto out; }
Signature · 4 lines
2.9.3 -- To unsubscribe from this list: send the line "unsubscribe autofs" in