|
 |
306fa1 |
autofs-5.0.7 - update kernel include files
|
|
|
306fa1 |
|
|
|
306fa1 |
From: Ian Kent <raven@themaw.net>
|
|
|
306fa1 |
|
|
|
306fa1 |
Update autofs include files to include the latest changes.
|
|
|
306fa1 |
---
|
|
|
306fa1 |
include/linux/auto_fs.h | 33 ++++++++++-----------------------
|
|
|
306fa1 |
include/linux/auto_fs4.h | 3 ++-
|
|
|
306fa1 |
2 files changed, 12 insertions(+), 24 deletions(-)
|
|
|
306fa1 |
|
|
|
306fa1 |
diff --git a/include/linux/auto_fs.h b/include/linux/auto_fs.h
|
|
|
306fa1 |
index 91d414f..64df1a6 100644
|
|
|
306fa1 |
--- a/include/linux/auto_fs.h
|
|
|
306fa1 |
+++ b/include/linux/auto_fs.h
|
|
|
306fa1 |
@@ -14,13 +14,8 @@
|
|
|
306fa1 |
#ifndef _LINUX_AUTO_FS_H
|
|
|
306fa1 |
#define _LINUX_AUTO_FS_H
|
|
|
306fa1 |
|
|
|
306fa1 |
-#ifdef __KERNEL__
|
|
|
306fa1 |
-#include <linux/fs.h>
|
|
|
306fa1 |
-#include <linux/limits.h>
|
|
|
306fa1 |
#include <linux/types.h>
|
|
|
306fa1 |
-#include <linux/ioctl.h>
|
|
|
306fa1 |
-#else
|
|
|
306fa1 |
-#include <asm/types.h>
|
|
|
306fa1 |
+#ifndef __KERNEL__
|
|
|
306fa1 |
#include <sys/ioctl.h>
|
|
|
306fa1 |
#endif /* __KERNEL__ */
|
|
|
306fa1 |
|
|
|
306fa1 |
@@ -32,25 +27,16 @@
|
|
|
306fa1 |
#define AUTOFS_MIN_PROTO_VERSION AUTOFS_PROTO_VERSION
|
|
|
306fa1 |
|
|
|
306fa1 |
/*
|
|
|
306fa1 |
- * Architectures where both 32- and 64-bit binaries can be executed
|
|
|
306fa1 |
- * on 64-bit kernels need this. This keeps the structure format
|
|
|
306fa1 |
- * uniform, and makes sure the wait_queue_token isn't too big to be
|
|
|
306fa1 |
- * passed back down to the kernel.
|
|
|
306fa1 |
- *
|
|
|
306fa1 |
- * This assumes that on these architectures:
|
|
|
306fa1 |
- * mode 32 bit 64 bit
|
|
|
306fa1 |
- * -------------------------
|
|
|
306fa1 |
- * int 32 bit 32 bit
|
|
|
306fa1 |
- * long 32 bit 64 bit
|
|
|
306fa1 |
- *
|
|
|
306fa1 |
- * If so, 32-bit user-space code should be backwards compatible.
|
|
|
306fa1 |
+ * The wait_queue_token (autofs_wqt_t) is part of a structure which is passed
|
|
|
306fa1 |
+ * back to the kernel via ioctl from userspace. On architectures where 32- and
|
|
|
306fa1 |
+ * 64-bit userspace binaries can be executed it's important that the size of
|
|
|
306fa1 |
+ * autofs_wqt_t stays constant between 32- and 64-bit Linux kernels so that we
|
|
|
306fa1 |
+ * do not break the binary ABI interface by changing the structure size.
|
|
|
306fa1 |
*/
|
|
|
306fa1 |
-
|
|
|
306fa1 |
-#if defined(__sparc__) || defined(__mips__) || defined(__x86_64__) \
|
|
|
306fa1 |
- || defined(__powerpc__) || defined(__s390__)
|
|
|
306fa1 |
-typedef unsigned int autofs_wqt_t;
|
|
|
306fa1 |
-#else
|
|
|
306fa1 |
+#if defined(__ia64__) || defined(__alpha__) /* pure 64bit architectures */
|
|
|
306fa1 |
typedef unsigned long autofs_wqt_t;
|
|
|
306fa1 |
+#else
|
|
|
306fa1 |
+typedef unsigned int autofs_wqt_t;
|
|
|
306fa1 |
#endif
|
|
|
306fa1 |
|
|
|
306fa1 |
/* Packet types */
|
|
|
306fa1 |
@@ -81,6 +67,7 @@ struct autofs_packet_expire {
|
|
|
306fa1 |
#define AUTOFS_IOC_FAIL _IO(0x93,0x61)
|
|
|
306fa1 |
#define AUTOFS_IOC_CATATONIC _IO(0x93,0x62)
|
|
|
306fa1 |
#define AUTOFS_IOC_PROTOVER _IOR(0x93,0x63,int)
|
|
|
306fa1 |
+#define AUTOFS_IOC_SETTIMEOUT32 _IOWR(0x93,0x64,compat_ulong_t)
|
|
|
306fa1 |
#define AUTOFS_IOC_SETTIMEOUT _IOWR(0x93,0x64,unsigned long)
|
|
|
306fa1 |
#define AUTOFS_IOC_EXPIRE _IOR(0x93,0x65,struct autofs_packet_expire)
|
|
|
306fa1 |
|
|
|
306fa1 |
diff --git a/include/linux/auto_fs4.h b/include/linux/auto_fs4.h
|
|
|
306fa1 |
index 55fa478..e02982f 100644
|
|
|
306fa1 |
--- a/include/linux/auto_fs4.h
|
|
|
306fa1 |
+++ b/include/linux/auto_fs4.h
|
|
|
306fa1 |
@@ -12,6 +12,7 @@
|
|
|
306fa1 |
#define _LINUX_AUTO_FS4_H
|
|
|
306fa1 |
|
|
|
306fa1 |
/* Include common v3 definitions */
|
|
|
306fa1 |
+#include <linux/types.h>
|
|
|
306fa1 |
#include <linux/auto_fs.h>
|
|
|
306fa1 |
|
|
|
306fa1 |
/* autofs v4 definitions */
|
|
|
306fa1 |
@@ -23,7 +24,7 @@
|
|
|
306fa1 |
#define AUTOFS_MIN_PROTO_VERSION 3
|
|
|
306fa1 |
#define AUTOFS_MAX_PROTO_VERSION 5
|
|
|
306fa1 |
|
|
|
306fa1 |
-#define AUTOFS_PROTO_SUBVERSION 1
|
|
|
306fa1 |
+#define AUTOFS_PROTO_SUBVERSION 2
|
|
|
306fa1 |
|
|
|
306fa1 |
/* Mask for expire behaviour */
|
|
|
306fa1 |
#define AUTOFS_EXP_IMMEDIATE 1
|