xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

autofs: remove duplicated AUTOFS_DEV_IOCTL_SIZE definition

Browse Source 
This macro is already defined in uapi header.  Also use this macro where
possible.

Link: http://lkml.kernel.org/r/148577166656.9801.10322423666945951186.stgit@pluto.themaw.net
Signed-off-by: Tomohiro Kusumi <tkusumi@tuxera.com>
Signed-off-by: Ian Kent <raven@themaw.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Tomohiro Kusumi
2017-02-27 14:27:14 -08:00
committed by Linus Torvalds
parent 0fae77feca
commit 3bb2fbdaba
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/autofs4/dev-ioctl.c
View File

@@ -38,8 +38,6 @@
* which have been left busy at at service shutdown. * which have been left busy at at service shutdown.
*/ */
#define AUTOFS_DEV_IOCTL_SIZE sizeof(struct autofs_dev_ioctl)
typedef int (*ioctl_fn)(struct file *, struct autofs_sb_info *, typedef int (*ioctl_fn)(struct file *, struct autofs_sb_info *,
struct autofs_dev_ioctl *); struct autofs_dev_ioctl *);

4
include/uapi/linux/auto_dev-ioctl.h
View File

@@ -113,10 +113,10 @@ struct autofs_dev_ioctl {
static inline void init_autofs_dev_ioctl(struct autofs_dev_ioctl *in) 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_major = AUTOFS_DEV_IOCTL_VERSION_MAJOR;
in->ver_minor = AUTOFS_DEV_IOCTL_VERSION_MINOR; in->ver_minor = AUTOFS_DEV_IOCTL_VERSION_MINOR;
in->size = sizeof(struct autofs_dev_ioctl); in->size = AUTOFS_DEV_IOCTL_SIZE;
in->ioctlfd = -1; in->ioctlfd = -1;
} }