mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-28 23:23:55 +08:00
7cee9384cb
Commitac6424b981("sched/wait: Rename wait_queue_t => wait_queue_entry_t") had scripted the renaming incorrectly, and didn't actually check that the 'wait_queue_t' was a full token. As a result, it also triggered on 'wait_queue_token', and renamed that to 'wait_queue_entry_token' entry in the autofs4 packet structure definition too. That was entirely incorrect, and not intended. The end result built fine when building just the kernel - because everything had been renamed consistently there - but caused problems in user space because the "struct autofs_packet_missing" type is exported as part of the uapi. This scripts it all back again: git grep -lw wait_queue_entry_token | xargs sed -i 's/wait_queue_entry_token/wait_queue_token/g' and checks the end result. Reported-by: Florian Fainelli <f.fainelli@gmail.com> Acked-by: Ingo Molnar <mingo@kernel.org> Fixes:ac6424b981("sched/wait: Rename wait_queue_t => wait_queue_entry_t") Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
164 lines
4.2 KiB
C
164 lines
4.2 KiB
C
/*
|
|
* Copyright 1999-2000 Jeremy Fitzhardinge <jeremy@goop.org>
|
|
*
|
|
* 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
|
|
* option, any later version, incorporated herein by reference.
|
|
*/
|
|
|
|
#ifndef _LINUX_AUTO_FS4_H
|
|
#define _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_EXPIRE_INDIRECT AUTOFS_IOC_EXPIRE_MULTI
|
|
#define AUTOFS_IOC_EXPIRE_DIRECT AUTOFS_IOC_EXPIRE_MULTI
|
|
#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 */
|