linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / linux / auto_fs4.h

diff --git a/include/linux/auto_fs4.h b/include/linux/auto_fs4.h
index 0a6bc52..9343c89 100644 (file)
--- a/include/linux/auto_fs4.h
+++ b/include/linux/auto_fs4.h
@@ -19,37 +19,18 @@
 #undef AUTOFS_MIN_PROTO_VERSION
 #undef AUTOFS_MAX_PROTO_VERSION
 
-#define AUTOFS_PROTO_VERSION           5
+#define AUTOFS_PROTO_VERSION           4
 #define AUTOFS_MIN_PROTO_VERSION       3
-#define AUTOFS_MAX_PROTO_VERSION       5
+#define AUTOFS_MAX_PROTO_VERSION       4
 
-#define AUTOFS_PROTO_SUBVERSION                0
+#define AUTOFS_PROTO_SUBVERSION                7
 
 /* Mask for expire behaviour */
 #define AUTOFS_EXP_IMMEDIATE           1
 #define AUTOFS_EXP_LEAVES              2
 
-/* Daemon notification packet types */
-enum autofs_notify {
-       NFY_NONE,
-       NFY_MOUNT,
-       NFY_EXPIRE
-};
-
-/* Kernel protocol version 4 packet types */
-
-/* Expire entry (umount request) */
-#define autofs_ptype_expire_multi      2
-
-/* Kernel protocol version 5 packet types */
-
-/* Indirect mount missing and expire requests. */
-#define autofs_ptype_missing_indirect  3
-#define autofs_ptype_expire_indirect   4
-
-/* Direct mount missing and expire requests */
-#define autofs_ptype_missing_direct    5
-#define autofs_ptype_expire_direct     6
+/* New message type */
+#define autofs_ptype_expire_multi      2       /* Expire entry (umount request) */
 
 /* v4 multi expire (via pipe) */
 struct autofs_packet_expire_multi {
@@ -59,36 +40,14 @@ struct autofs_packet_expire_multi {
        char name[NAME_MAX+1];
 };
 
-/* autofs v5 common packet struct */
-struct autofs_v5_packet {
-       struct autofs_packet_hdr hdr;
-       autofs_wqt_t wait_queue_token;
-       __u32 dev;
-       __u64 ino;
-       __u32 uid;
-       __u32 gid;
-       __u32 pid;
-       __u32 tgid;
-       __u32 len;
-       char name[NAME_MAX+1];
-};
-
-typedef struct autofs_v5_packet autofs_packet_missing_indirect_t;
-typedef struct autofs_v5_packet autofs_packet_expire_indirect_t;
-typedef struct autofs_v5_packet autofs_packet_missing_direct_t;
-typedef struct autofs_v5_packet autofs_packet_expire_direct_t;
-
 union autofs_packet_union {
        struct autofs_packet_hdr hdr;
        struct autofs_packet_missing missing;
        struct autofs_packet_expire expire;
        struct autofs_packet_expire_multi expire_multi;
-       struct autofs_v5_packet v5_packet;
 };
 
 #define AUTOFS_IOC_EXPIRE_MULTI                _IOW(0x93,0x66,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_ASKREGHOST           _IOR(0x93,0x68,int)
 #define AUTOFS_IOC_TOGGLEREGHOST        _IOR(0x93,0x69,int)