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.
Showing the changes to include/uapi/linux (3 of 3 files). Show all
Unified · Split
| @@ -156,8 +156,6 @@ enum { · 155 unmodified lines | ||
| 156 | 156 | AUTOFS_DEV_IOCTL_ISMOUNTPOINT_CMD, |
| 157 | 157 | }; |
| 158 | 158 | |
| 159 | −#define AUTOFS_IOCTL 0x93 | |
| 160 | − | |
| 161 | 159 | #define AUTOFS_DEV_IOCTL_VERSION \ |
| 162 | 160 | _IOWR(AUTOFS_IOCTL, \ |
| 163 | 161 | AUTOFS_DEV_IOCTL_VERSION_CMD, struct autofs_dev_ioctl) |
| @@ -61,12 +61,23 @@ struct autofs_packet_expire { · 60 unmodified lines | ||
| 61 | 61 | char name[NAME_MAX+1]; |
| 62 | 62 | }; |
| 63 | 63 | |
| 64 | −#define AUTOFS_IOC_READY _IO(0x93, 0x60) | |
| 65 | −#define AUTOFS_IOC_FAIL _IO(0x93, 0x61) | |
| 66 | −#define AUTOFS_IOC_CATATONIC _IO(0x93, 0x62) | |
| 67 | −#define AUTOFS_IOC_PROTOVER _IOR(0x93, 0x63, int) | |
| 68 | −#define AUTOFS_IOC_SETTIMEOUT32 _IOWR(0x93, 0x64, compat_ulong_t) | |
| 69 | −#define AUTOFS_IOC_SETTIMEOUT _IOWR(0x93, 0x64, unsigned long) | |
| 70 | −#define AUTOFS_IOC_EXPIRE _IOR(0x93, 0x65, struct autofs_packet_expire) | |
| 64 | +#define AUTOFS_IOCTL 0x93 | |
| 65 | + | |
| 66 | +enum { | |
| 67 | + AUTOFS_IOC_READY_CMD = 0x60, | |
| 68 | + AUTOFS_IOC_FAIL_CMD, | |
| 69 | + AUTOFS_IOC_CATATONIC_CMD, | |
| 70 | + AUTOFS_IOC_PROTOVER_CMD, | |
| 71 | + AUTOFS_IOC_SETTIMEOUT_CMD, | |
| 72 | + AUTOFS_IOC_EXPIRE_CMD, | |
| 73 | +}; | |
| 74 | + | |
| 75 | +#define AUTOFS_IOC_READY _IO(AUTOFS_IOCTL, AUTOFS_IOC_READY_CMD) | |
| 76 | +#define AUTOFS_IOC_FAIL _IO(AUTOFS_IOCTL, AUTOFS_IOC_FAIL_CMD) | |
| 77 | +#define AUTOFS_IOC_CATATONIC _IO(AUTOFS_IOCTL, AUTOFS_IOC_CATATONIC_CMD) | |
| 78 | +#define AUTOFS_IOC_PROTOVER _IOR(AUTOFS_IOCTL, AUTOFS_IOC_PROTOVER_CMD, int) | |
| 79 | +#define AUTOFS_IOC_SETTIMEOUT32 _IOWR(AUTOFS_IOCTL, AUTOFS_IOC_SETTIMEOUT_CMD, compat_ulong_t) | |
| 80 | +#define AUTOFS_IOC_SETTIMEOUT _IOWR(AUTOFS_IOCTL, AUTOFS_IOC_SETTIMEOUT_CMD, unsigned long) | |
| 81 | +#define AUTOFS_IOC_EXPIRE _IOR(AUTOFS_IOCTL, AUTOFS_IOC_EXPIRE_CMD, struct autofs_packet_expire) | |
| 71 | 82 | |
| 72 | 83 | #endif /* _UAPI_LINUX_AUTO_FS_H */ |
| @@ -148,10 +148,16 @@ union autofs_v5_packet_union { · 147 unmodified lines | ||
| 148 | 148 | autofs_packet_expire_direct_t expire_direct; |
| 149 | 149 | }; |
| 150 | 150 | |
| 151 | −#define AUTOFS_IOC_EXPIRE_MULTI _IOW(0x93, 0x66, int) | |
| 152 | −#define AUTOFS_IOC_EXPIRE_INDIRECT AUTOFS_IOC_EXPIRE_MULTI | |
| 153 | −#define AUTOFS_IOC_EXPIRE_DIRECT AUTOFS_IOC_EXPIRE_MULTI | |
| 154 | −#define AUTOFS_IOC_PROTOSUBVER _IOR(0x93, 0x67, int) | |
| 155 | −#define AUTOFS_IOC_ASKUMOUNT _IOR(0x93, 0x70, int) | |
| 151 | +enum { | |
| 152 | + AUTOFS_IOC_EXPIRE_MULTI_CMD = 0x66, /* AUTOFS_IOC_EXPIRE_CMD + 1 */ | |
| 153 | + AUTOFS_IOC_PROTOSUBVER_CMD, | |
| 154 | + AUTOFS_IOC_ASKUMOUNT_CMD = 0x70, /* AUTOFS_DEV_IOCTL_VERSION_CMD - 1 */ | |
| 155 | +}; | |
| 156 | + | |
| 157 | +#define AUTOFS_IOC_EXPIRE_MULTI _IOW(AUTOFS_IOCTL, AUTOFS_IOC_EXPIRE_MULTI_CMD, int) | |
| 158 | +#define AUTOFS_IOC_EXPIRE_INDIRECT AUTOFS_IOC_EXPIRE_MULTI | |
| 159 | +#define AUTOFS_IOC_EXPIRE_DIRECT AUTOFS_IOC_EXPIRE_MULTI | |
| 160 | +#define AUTOFS_IOC_PROTOSUBVER _IOR(AUTOFS_IOCTL, AUTOFS_IOC_PROTOSUBVER_CMD, int) | |
| 161 | +#define AUTOFS_IOC_ASKUMOUNT _IOR(AUTOFS_IOCTL, AUTOFS_IOC_ASKUMOUNT_CMD, int) | |
| 156 | 162 | |
| 157 | 163 | #endif /* _LINUX_AUTO_FS4_H */ |