diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 16:51:25 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 16:51:25 +1100 |
commit | a9be5a59553a6b5d424d8ed37f058edfcc09a7d9 (patch) | |
tree | 9a06877913222d1d4f0ccc09c34d23a3b88d6e10 /include/uapi/linux/auto_dev-ioctl.h | |
parent | eb27cd91f0b42319cd1cdefbed9ed7d87215890f (diff) | |
parent | 0cbe42d9fadb4e29daa00a86d7030488d9469912 (diff) |
Merge branch 'akpm-current/current'
Diffstat (limited to 'include/uapi/linux/auto_dev-ioctl.h')
-rw-r--r-- | include/uapi/linux/auto_dev-ioctl.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/include/uapi/linux/auto_dev-ioctl.h b/include/uapi/linux/auto_dev-ioctl.h index 021ed331dd71..744b3d060968 100644 --- a/include/uapi/linux/auto_dev-ioctl.h +++ b/include/uapi/linux/auto_dev-ioctl.h @@ -113,17 +113,13 @@ struct autofs_dev_ioctl { static inline void init_autofs_dev_ioctl(struct autofs_dev_ioctl *in) { - memset(in, 0, sizeof(struct autofs_dev_ioctl)); + memset(in, 0, AUTOFS_DEV_IOCTL_SIZE); in->ver_major = AUTOFS_DEV_IOCTL_VERSION_MAJOR; in->ver_minor = AUTOFS_DEV_IOCTL_VERSION_MINOR; - in->size = sizeof(struct autofs_dev_ioctl); + in->size = AUTOFS_DEV_IOCTL_SIZE; in->ioctlfd = -1; } -/* - * If you change this make sure you make the corresponding change - * to autofs-dev-ioctl.c:lookup_ioctl() - */ enum { /* Get various version info */ AUTOFS_DEV_IOCTL_VERSION_CMD = 0x71, @@ -160,8 +156,6 @@ enum { AUTOFS_DEV_IOCTL_ISMOUNTPOINT_CMD, }; -#define AUTOFS_IOCTL 0x93 - #define AUTOFS_DEV_IOCTL_VERSION \ _IOWR(AUTOFS_IOCTL, \ AUTOFS_DEV_IOCTL_VERSION_CMD, struct autofs_dev_ioctl) |