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

autofs: add command enum/macros for root-dir ioctls 

Sync root-dir ioctl with misc-char-dev ioctl's enum/macro format since
these two types of ioctls aren't completely independent of each other in
terms of command nr.  No functional changes.

Link: http://lkml.kernel.org/r/148577166143.9801.15511796506678428145.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 88488080

include/uapi/linux/auto_dev-ioctl.h

+0 −2
Original line number Diff line number Diff line
@@ -156,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)

include/uapi/linux/auto_fs.h

+18 −7
Original line number Diff line number Diff line
@@ -61,12 +61,23 @@ struct autofs_packet_expire { 
	char name[NAME_MAX+1];

};



#define AUTOFS_IOC_READY      _IO(0x93, 0x60)

#define AUTOFS_IOC_FAIL       _IO(0x93, 0x61)

#define AUTOFS_IOC_CATATONIC  _IO(0x93, 0x62)

#define AUTOFS_IOC_PROTOVER   _IOR(0x93, 0x63, int)

#define AUTOFS_IOC_SETTIMEOUT32 _IOWR(0x93, 0x64, compat_ulong_t)

#define AUTOFS_IOC_SETTIMEOUT _IOWR(0x93, 0x64, unsigned long)

#define AUTOFS_IOC_EXPIRE     _IOR(0x93, 0x65, struct autofs_packet_expire)

#define AUTOFS_IOCTL 0x93



enum {

	AUTOFS_IOC_READY_CMD = 0x60,

	AUTOFS_IOC_FAIL_CMD,

	AUTOFS_IOC_CATATONIC_CMD,

	AUTOFS_IOC_PROTOVER_CMD,

	AUTOFS_IOC_SETTIMEOUT_CMD,

	AUTOFS_IOC_EXPIRE_CMD,

};



#define AUTOFS_IOC_READY        _IO(AUTOFS_IOCTL, AUTOFS_IOC_READY_CMD)

#define AUTOFS_IOC_FAIL         _IO(AUTOFS_IOCTL, AUTOFS_IOC_FAIL_CMD)

#define AUTOFS_IOC_CATATONIC    _IO(AUTOFS_IOCTL, AUTOFS_IOC_CATATONIC_CMD)

#define AUTOFS_IOC_PROTOVER     _IOR(AUTOFS_IOCTL, AUTOFS_IOC_PROTOVER_CMD, int)

#define AUTOFS_IOC_SETTIMEOUT32 _IOWR(AUTOFS_IOCTL, AUTOFS_IOC_SETTIMEOUT_CMD, compat_ulong_t)

#define AUTOFS_IOC_SETTIMEOUT   _IOWR(AUTOFS_IOCTL, AUTOFS_IOC_SETTIMEOUT_CMD, unsigned long)

#define AUTOFS_IOC_EXPIRE       _IOR(AUTOFS_IOCTL, AUTOFS_IOC_EXPIRE_CMD, struct autofs_packet_expire)



#endif /* _UAPI_LINUX_AUTO_FS_H */

include/uapi/linux/auto_fs4.h

+11 −5
Original line number Diff line number Diff line
@@ -148,10 +148,16 @@ union autofs_v5_packet_union { 
	autofs_packet_expire_direct_t expire_direct;

};



#define AUTOFS_IOC_EXPIRE_MULTI		_IOW(0x93, 0x66, int)

enum {

	AUTOFS_IOC_EXPIRE_MULTI_CMD = 0x66, /* AUTOFS_IOC_EXPIRE_CMD + 1 */

	AUTOFS_IOC_PROTOSUBVER_CMD,

	AUTOFS_IOC_ASKUMOUNT_CMD = 0x70, /* AUTOFS_DEV_IOCTL_VERSION_CMD - 1 */

};



#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(0x93, 0x67, int)

#define AUTOFS_IOC_ASKUMOUNT		_IOR(0x93, 0x70, int)

#define AUTOFS_IOC_PROTOSUBVER     _IOR(AUTOFS_IOCTL, AUTOFS_IOC_PROTOSUBVER_CMD, int)

#define AUTOFS_IOC_ASKUMOUNT       _IOR(AUTOFS_IOCTL, AUTOFS_IOC_ASKUMOUNT_CMD, int)



#endif /* _LINUX_AUTO_FS4_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE