Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef8b42f7 authored by Ian Kent's avatar Ian Kent Committed by Linus Torvalds
Browse files

autofs4: merge auto_fs.h and auto_fs4.h 

The autofs module has long since been removed so there's no need to have
two separate include files for autofs.

Link: http://lkml.kernel.org/r/152626703024.28589.9571964661718767929.stgit@pluto.themaw.net


Signed-off-by: default avatarIan Kent <raven@themaw.net>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5cc41e09

fs/autofs4/autofs_i.h

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 


/* Internal header file for autofs */



#include <linux/auto_fs4.h>

#include <linux/auto_fs.h>

#include <linux/auto_dev-ioctl.h>



#include <linux/kernel.h>

fs/compat_ioctl.c

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
#include <linux/if_pppox.h>

#include <linux/mtio.h>

#include <linux/auto_fs.h>

#include <linux/auto_fs4.h>

#include <linux/tty.h>

#include <linux/vt_kern.h>

#include <linux/fb.h>

include/uapi/linux/auto_fs.h

+157 −12
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */

/*

 * Copyright 1997 Transmeta Corporation - All Rights Reserved

 * Copyright 1999-2000 Jeremy Fitzhardinge <jeremy@goop.org>

 * Copyright 2005-2006,2013,2017-2018 Ian Kent <raven@themaw.net>

 *

 * This file is part of the Linux kernel and is made available under

 * the terms of the GNU General Public License, version 2, or at your
@@ -8,7 +10,6 @@ 
 *

 * ----------------------------------------------------------------------- */





#ifndef _UAPI_LINUX_AUTO_FS_H

#define _UAPI_LINUX_AUTO_FS_H
@@ -18,13 +19,11 @@ 
#include <sys/ioctl.h>

#endif /* __KERNEL__ */



#define AUTOFS_PROTO_VERSION		5

#define AUTOFS_MIN_PROTO_VERSION	3

#define AUTOFS_MAX_PROTO_VERSION	5



/* This file describes autofs v3 */

#define AUTOFS_PROTO_VERSION	3



/* Range of protocol versions defined */

#define AUTOFS_MAX_PROTO_VERSION	AUTOFS_PROTO_VERSION

#define AUTOFS_MIN_PROTO_VERSION	AUTOFS_PROTO_VERSION

#define AUTOFS_PROTO_SUBVERSION		2



/*

 * The wait_queue_token (autofs_wqt_t) is part of a structure which is passed
@@ -76,9 +75,155 @@ enum { 
#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)

#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)



/* autofs version 4 and later definitions */



/* Mask for expire behaviour */

#define AUTOFS_EXP_IMMEDIATE		1

#define AUTOFS_EXP_LEAVES		2



#define AUTOFS_TYPE_ANY			0U

#define AUTOFS_TYPE_INDIRECT		1U

#define AUTOFS_TYPE_DIRECT		2U

#define AUTOFS_TYPE_OFFSET		4U



static inline void set_autofs_type_indirect(unsigned int *type)

{

	*type = AUTOFS_TYPE_INDIRECT;

}



static inline unsigned int autofs_type_indirect(unsigned int type)

{

	return (type == AUTOFS_TYPE_INDIRECT);

}



static inline void set_autofs_type_direct(unsigned int *type)

{

	*type = AUTOFS_TYPE_DIRECT;

}



static inline unsigned int autofs_type_direct(unsigned int type)

{

	return (type == AUTOFS_TYPE_DIRECT);

}



static inline void set_autofs_type_offset(unsigned int *type)

{

	*type = AUTOFS_TYPE_OFFSET;

}



static inline unsigned int autofs_type_offset(unsigned int type)

{

	return (type == AUTOFS_TYPE_OFFSET);

}



static inline unsigned int autofs_type_trigger(unsigned int type)

{

	return (type == AUTOFS_TYPE_DIRECT || type == AUTOFS_TYPE_OFFSET);

}



/*

 * This isn't really a type as we use it to say "no type set" to

 * indicate we want to search for "any" mount in the

 * autofs_dev_ioctl_ismountpoint() device ioctl function.

 */

static inline void set_autofs_type_any(unsigned int *type)

{

	*type = AUTOFS_TYPE_ANY;

}



static inline unsigned int autofs_type_any(unsigned int type)

{

	return (type == AUTOFS_TYPE_ANY);

}



/* 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 {

	struct autofs_packet_hdr hdr;

	autofs_wqt_t wait_queue_token;

	int len;

	char name[NAME_MAX+1];

};



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;

};



/* 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_v5_packet_union {

	struct autofs_packet_hdr hdr;

	struct autofs_v5_packet v5_packet;

	autofs_packet_missing_indirect_t missing_indirect;

	autofs_packet_expire_indirect_t expire_indirect;

	autofs_packet_missing_direct_t missing_direct;

	autofs_packet_expire_direct_t expire_direct;

};



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_PROTOSUBVER		_IOR(AUTOFS_IOCTL, \

					     AUTOFS_IOC_PROTOSUBVER_CMD, int)

#define AUTOFS_IOC_ASKUMOUNT		_IOR(AUTOFS_IOCTL, \

					     AUTOFS_IOC_ASKUMOUNT_CMD, int)



#endif /* _UAPI_LINUX_AUTO_FS_H */

include/uapi/linux/auto_fs4.h

+3 −150
Original line number Diff line number Diff line
@@ -7,156 +7,9 @@ 
 * option, any later version, incorporated herein by reference.

 */



#ifndef _LINUX_AUTO_FS4_H

#define _LINUX_AUTO_FS4_H

#ifndef _UAPI_LINUX_AUTO_FS4_H

#define _UAPI_LINUX_AUTO_FS4_H



/* Include common v3 definitions */

#include <linux/types.h>

#include <linux/auto_fs.h>



/* autofs v4 definitions */

#undef AUTOFS_PROTO_VERSION

#undef AUTOFS_MIN_PROTO_VERSION

#undef AUTOFS_MAX_PROTO_VERSION



#define AUTOFS_PROTO_VERSION		5

#define AUTOFS_MIN_PROTO_VERSION	3

#define AUTOFS_MAX_PROTO_VERSION	5



#define AUTOFS_PROTO_SUBVERSION		2



/* Mask for expire behaviour */

#define AUTOFS_EXP_IMMEDIATE		1

#define AUTOFS_EXP_LEAVES		2



#define AUTOFS_TYPE_ANY			0U

#define AUTOFS_TYPE_INDIRECT		1U

#define AUTOFS_TYPE_DIRECT		2U

#define AUTOFS_TYPE_OFFSET		4U



static inline void set_autofs_type_indirect(unsigned int *type)

{

	*type = AUTOFS_TYPE_INDIRECT;

}



static inline unsigned int autofs_type_indirect(unsigned int type)

{

	return (type == AUTOFS_TYPE_INDIRECT);

}



static inline void set_autofs_type_direct(unsigned int *type)

{

	*type = AUTOFS_TYPE_DIRECT;

}



static inline unsigned int autofs_type_direct(unsigned int type)

{

	return (type == AUTOFS_TYPE_DIRECT);

}



static inline void set_autofs_type_offset(unsigned int *type)

{

	*type = AUTOFS_TYPE_OFFSET;

}



static inline unsigned int autofs_type_offset(unsigned int type)

{

	return (type == AUTOFS_TYPE_OFFSET);

}



static inline unsigned int autofs_type_trigger(unsigned int type)

{

	return (type == AUTOFS_TYPE_DIRECT || type == AUTOFS_TYPE_OFFSET);

}



/*

 * This isn't really a type as we use it to say "no type set" to

 * indicate we want to search for "any" mount in the

 * autofs_dev_ioctl_ismountpoint() device ioctl function.

 */

static inline void set_autofs_type_any(unsigned int *type)

{

	*type = AUTOFS_TYPE_ANY;

}



static inline unsigned int autofs_type_any(unsigned int type)

{

	return (type == AUTOFS_TYPE_ANY);

}



/* 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 {

	struct autofs_packet_hdr hdr;

	autofs_wqt_t wait_queue_token;

	int len;

	char name[NAME_MAX+1];

};



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;

};



/* 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_v5_packet_union {

	struct autofs_packet_hdr hdr;

	struct autofs_v5_packet v5_packet;

	autofs_packet_missing_indirect_t missing_indirect;

	autofs_packet_expire_indirect_t expire_indirect;

	autofs_packet_missing_direct_t missing_direct;

	autofs_packet_expire_direct_t expire_direct;

};



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_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 */
 
#endif /* _UAPI_LINUX_AUTO_FS4_H */