autofs4 - add new packet type for v5 communications
Subsystems (2)
Ian Kent
maintainerPATCH 4/4 autofs4 - add new packet type for v5 communications
This patch define a new autofs packet for autofs v5 and updates the waitq.c functions to handle the additional packet type.
include/linux/auto_fs4.h renamed from include/linux/auto_fs4.h.v5-packet-proto +46 -5
@@ -19,18 +19,37 @@#undef AUTOFS_MIN_PROTO_VERSION#undef AUTOFS_MAX_PROTO_VERSION -#define AUTOFS_PROTO_VERSION 4 +#define AUTOFS_PROTO_VERSION 5#define AUTOFS_MIN_PROTO_VERSION 3 -#define AUTOFS_MAX_PROTO_VERSION 4 +#define AUTOFS_MAX_PROTO_VERSION 5 -#define AUTOFS_PROTO_SUBVERSION 10 +#define AUTOFS_PROTO_SUBVERSION 0/* Mask for expire behaviour */ #define AUTOFS_EXP_IMMEDIATE 1#define AUTOFS_EXP_LEAVES 2 -/* New message type */ -#define autofs_ptype_expire_multi 2/* Expire entry (umount request) */ +/* 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/* v4 multi expire (via pipe) */ struct autofs_packet_expire_multi {
@@ -40,14 +59,36 @@ 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; +uid_t uid; +gid_t gid; +pid_t pid; +pid_t tgid; +int 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)
fs/autofs4/autofs_i.h renamed from fs/autofs4/autofs_i.h.v5-packet-proto +16 -7
@@ -77,6 +77,12 @@ struct autofs_wait_queue {int hash;int len;char *name; +u32 dev; +u64 ino; +uid_t uid; +gid_t gid; +pid_t pid; +pid_t tgid;/* This is for status reporting upon return */ int status;atomic_t notified;
@@ -179,13 +185,6 @@ struct autofs_info *autofs4_init_ino(str/* Queue management functions */ -enum autofs_notify -{ -NFY_NONE , -NFY_MOUNT , -NFY_EXPIRE -}; -int autofs4_wait (struct autofs_sb_info *,struct dentry *,enum autofs_notify );int autofs4_wait_release (struct autofs_sb_info *,autofs_wqt_t ,int );void autofs4_catatonic_mode (struct autofs_sb_info *);
@@ -203,6 +202,16 @@ static inline int autofs4_follow_mount(sreturn res; } +static inline u32 autofs4_get_dev (struct autofs_sb_info *sbi) +{ +return new_encode_dev (sbi->sb->s_dev); +} + +static inline u64 autofs4_get_ino (struct autofs_sb_info *sbi) +{ +return sbi->sb->s_root->d_inode->i_ino; +} +static inline int simple_positive (struct dentry *dentry) {return dentry->d_inode && !d_unhashed (dentry);
fs/autofs4/waitq.c renamed from fs/autofs4/waitq.c.v5-packet-proto +74 -12
137 lines not on this page · raw message