mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 21:57:43 +00: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>
83 lines
2.6 KiB
C
83 lines
2.6 KiB
C
/*
|
|
* Copyright 1997 Transmeta Corporation - All Rights Reserved
|
|
*
|
|
* 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 _UAPI_LINUX_AUTO_FS_H
|
|
#define _UAPI_LINUX_AUTO_FS_H
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/limits.h>
|
|
#ifndef __KERNEL__
|
|
#include <sys/ioctl.h>
|
|
#endif /* __KERNEL__ */
|
|
|
|
|
|
/* 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
|
|
|
|
/*
|
|
* The wait_queue_token (autofs_wqt_t) is part of a structure which is passed
|
|
* back to the kernel via ioctl from userspace. On architectures where 32- and
|
|
* 64-bit userspace binaries can be executed it's important that the size of
|
|
* autofs_wqt_t stays constant between 32- and 64-bit Linux kernels so that we
|
|
* do not break the binary ABI interface by changing the structure size.
|
|
*/
|
|
#if defined(__ia64__) || defined(__alpha__) /* pure 64bit architectures */
|
|
typedef unsigned long autofs_wqt_t;
|
|
#else
|
|
typedef unsigned int autofs_wqt_t;
|
|
#endif
|
|
|
|
/* Packet types */
|
|
#define autofs_ptype_missing 0 /* Missing entry (mount request) */
|
|
#define autofs_ptype_expire 1 /* Expire entry (umount request) */
|
|
|
|
struct autofs_packet_hdr {
|
|
int proto_version; /* Protocol version */
|
|
int type; /* Type of packet */
|
|
};
|
|
|
|
struct autofs_packet_missing {
|
|
struct autofs_packet_hdr hdr;
|
|
autofs_wqt_t wait_queue_token;
|
|
int len;
|
|
char name[NAME_MAX+1];
|
|
};
|
|
|
|
/* v3 expire (via ioctl) */
|
|
struct autofs_packet_expire {
|
|
struct autofs_packet_hdr hdr;
|
|
int len;
|
|
char name[NAME_MAX+1];
|
|
};
|
|
|
|
#define AUTOFS_IOCTL 0x93
|
|
|
|
enum {
|
|
AUTOFS_IOC_READY_CMD = 0x60,
|
|
AUTOFS_IOC_FAIL_CMD,
|
|
AUTOFS_IOC_CATATONIC_CMD,
|
|
AUTOFS_IOC_PROTOVER_CMD,
|
|
AUTOFS_IOC_SETTIMEOUT_CMD,
|
|
AUTOFS_IOC_EXPIRE_CMD,
|
|
};
|
|
|
|
#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)
|
|
|
|
#endif /* _UAPI_LINUX_AUTO_FS_H */
|