History

Merge tag 'staging-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging/IIO updates from Greg KH: "Here is the big staging and IIO driver update for 4.18-rc1. It was delayed as I wanted to make sure the final driver deletions did not cause any major merge issues, and all now looks good. There are a lot of patches here, just over 1000. The diffstat summary shows the major changes here: 1007 files changed, 16828 insertions(+), 227770 deletions(-) Because of this, we might be close to shrinking the overall kernel source code size for two releases in a row. There was loads of work in this release cycle, primarily: - tons of ks7010 driver cleanups - lots of mt7621 driver fixes and cleanups - most driver cleanups - wilc1000 fixes and cleanups - lots and lots of IIO driver cleanups and new additions - debugfs cleanups for all staging drivers - lots of other staging driver cleanups and fixes, the shortlog has the full details. but the big user-visable things here are the removal of 3 chunks of code: - ncpfs and ipx were removed on schedule, no one has cared about this code since it moved to staging last year, and if it needs to come back, it can be reverted. - lustre file system is removed. I've ranted at the lustre developers about once a year for the past 5 years, with no real forward progress at all to clean things up and get the code into the "real" part of the kernel. Given that the lustre developers continue to work on an external tree and try to port those changes to the in-kernel tree every once in a while, this whole thing really really is not working out at all. So I'm deleting it so that the developers can spend the time working in their out-of-tree location and get things cleaned up properly to get merged into the tree correctly at a later date. Because of these file removals, you will have merge issues on some of these files (2 in the ipx code, 1 in the ncpfs code, and 1 in the atomisp driver). Just delete those files, it's a simple merge :) All of this has been in linux-next for a while with no reported problems" * tag 'staging-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1011 commits) staging: ipx: delete it from the tree ncpfs: remove uapi .h files ncpfs: remove Documentation ncpfs: remove compat functionality staging: ncpfs: delete it staging: lustre: delete the filesystem from the tree. staging: vc04_services: no need to save the log debufs dentries staging: vc04_services: vchiq_debugfs_log_entry can be a void * staging: vc04_services: remove struct vchiq_debugfs_info staging: vc04_services: move client dbg directory into static variable staging: vc04_services: remove odd vchiq_debugfs_top() wrapper staging: vc04_services: no need to check debugfs return values staging: mt7621-gpio: reorder includes alphabetically staging: mt7621-gpio: change gc_map to don't use pointers staging: mt7621-gpio: use GPIOF_DIR_OUT and GPIOF_DIR_IN macros instead of custom values staging: mt7621-gpio: change 'to_mediatek_gpio' to make just a one line return staging: mt7621-gpio: dt-bindings: update documentation for #interrupt-cells property staging: mt7621-gpio: update #interrupt-cells for the gpio node staging: mt7621-gpio: dt-bindings: complete documentation for the gpio staging: mt7621-dts: add missing properties to gpio node ...

Linus Torvalds committed 8 years ago

Commit eafdca42 parents 7d3bf61 7a2e8381006 files · +16823 −227723Browse files

Showing the changes to include/uapi (4 of 1006 files). Show all

Unified · Split

4 files
  1. include/uapi/linux/ncp.h +0 −202
  2. include/uapi/linux/ncp_fs.h +0 −147
  3. include/uapi/linux/ncp_mount.h +0 −72
  4. include/uapi/linux/ncp_no.h +0 −20
include/uapi/linux/ncp.h+0−202
@@ -1,202 +0,0 @@
1−/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2−/*
3− * ncp.h
4− *
5− * Copyright (C) 1995 by Volker Lendecke
6− * Modified for sparc by J.F. Chadima
7− * Modified for __constant_ntoh by Frank A. Vorstenbosch
8− *
9− */
10−
11−#ifndef _LINUX_NCP_H
12−#define _LINUX_NCP_H
13−
14−#include <linux/types.h>
15−
16−#define NCP_PTYPE (0x11)
17−#define NCP_PORT (0x0451)
18−
19−#define NCP_ALLOC_SLOT_REQUEST (0x1111)
20−#define NCP_REQUEST (0x2222)
21−#define NCP_DEALLOC_SLOT_REQUEST (0x5555)
22−
23−struct ncp_request_header {
24− __u16 type;
25− __u8 sequence;
26− __u8 conn_low;
27− __u8 task;
28− __u8 conn_high;
29− __u8 function;
30− __u8 data[0];
31−} __attribute__((packed));
32−
33−#define NCP_REPLY (0x3333)
34−#define NCP_WATCHDOG (0x3E3E)
35−#define NCP_POSITIVE_ACK (0x9999)
36−
37−struct ncp_reply_header {
38− __u16 type;
39− __u8 sequence;
40− __u8 conn_low;
41− __u8 task;
42− __u8 conn_high;
43− __u8 completion_code;
44− __u8 connection_state;
45− __u8 data[0];
46−} __attribute__((packed));
47−
48−#define NCP_VOLNAME_LEN (16)
49−#define NCP_NUMBER_OF_VOLUMES (256)
50−struct ncp_volume_info {
51− __u32 total_blocks;
52− __u32 free_blocks;
53− __u32 purgeable_blocks;
54− __u32 not_yet_purgeable_blocks;
55− __u32 total_dir_entries;
56− __u32 available_dir_entries;
57− __u8 sectors_per_block;
58− char volume_name[NCP_VOLNAME_LEN + 1];
59−};
60−
61−#define AR_READ (cpu_to_le16(1))
62−#define AR_WRITE (cpu_to_le16(2))
63−#define AR_EXCLUSIVE (cpu_to_le16(0x20))
64−
65−#define NCP_FILE_ID_LEN 6
66−
67−/* Defines for Name Spaces */
68−#define NW_NS_DOS 0
69−#define NW_NS_MAC 1
70−#define NW_NS_NFS 2
71−#define NW_NS_FTAM 3
72−#define NW_NS_OS2 4
73−
74−/* Defines for ReturnInformationMask */
75−#define RIM_NAME (cpu_to_le32(1))
76−#define RIM_SPACE_ALLOCATED (cpu_to_le32(2))
77−#define RIM_ATTRIBUTES (cpu_to_le32(4))
78−#define RIM_DATA_SIZE (cpu_to_le32(8))
79−#define RIM_TOTAL_SIZE (cpu_to_le32(0x10))
80−#define RIM_EXT_ATTR_INFO (cpu_to_le32(0x20))
81−#define RIM_ARCHIVE (cpu_to_le32(0x40))
82−#define RIM_MODIFY (cpu_to_le32(0x80))
83−#define RIM_CREATION (cpu_to_le32(0x100))
84−#define RIM_OWNING_NAMESPACE (cpu_to_le32(0x200))
85−#define RIM_DIRECTORY (cpu_to_le32(0x400))
86−#define RIM_RIGHTS (cpu_to_le32(0x800))
87−#define RIM_ALL (cpu_to_le32(0xFFF))
88−#define RIM_COMPRESSED_INFO (cpu_to_le32(0x80000000))
89−
90−/* Defines for NSInfoBitMask */
91−#define NSIBM_NFS_NAME 0x0001
92−#define NSIBM_NFS_MODE 0x0002
93−#define NSIBM_NFS_GID 0x0004
94−#define NSIBM_NFS_NLINKS 0x0008
95−#define NSIBM_NFS_RDEV 0x0010
96−#define NSIBM_NFS_LINK 0x0020
97−#define NSIBM_NFS_CREATED 0x0040
98−#define NSIBM_NFS_UID 0x0080
99−#define NSIBM_NFS_ACSFLAG 0x0100
100−#define NSIBM_NFS_MYFLAG 0x0200
101−
102−/* open/create modes */
103−#define OC_MODE_OPEN 0x01
104−#define OC_MODE_TRUNCATE 0x02
105−#define OC_MODE_REPLACE 0x02
106−#define OC_MODE_CREATE 0x08
107−
108−/* open/create results */
109−#define OC_ACTION_NONE 0x00
110−#define OC_ACTION_OPEN 0x01
111−#define OC_ACTION_CREATE 0x02
112−#define OC_ACTION_TRUNCATE 0x04
113−#define OC_ACTION_REPLACE 0x04
114−
115−/* access rights attributes */
116−#ifndef AR_READ_ONLY
117−#define AR_READ_ONLY 0x0001
118−#define AR_WRITE_ONLY 0x0002
119−#define AR_DENY_READ 0x0004
120−#define AR_DENY_WRITE 0x0008
121−#define AR_COMPATIBILITY 0x0010
122−#define AR_WRITE_THROUGH 0x0040
123−#define AR_OPEN_COMPRESSED 0x0100
124−#endif
125−
126−struct nw_nfs_info {
127− __u32 mode;
128− __u32 rdev;
129−};
130−
131−struct nw_info_struct {
132− __u32 spaceAlloc;
133− __le32 attributes;
134− __u16 flags;
135− __le32 dataStreamSize;
136− __le32 totalStreamSize;
137− __u16 numberOfStreams;
138− __le16 creationTime;
139− __le16 creationDate;
140− __u32 creatorID;
141− __le16 modifyTime;
142− __le16 modifyDate;
143− __u32 modifierID;
144− __le16 lastAccessDate;
145− __u16 archiveTime;
146− __u16 archiveDate;
147− __u32 archiverID;
148− __u16 inheritedRightsMask;
149− __le32 dirEntNum;
150− __le32 DosDirNum;
151− __u32 volNumber;
152− __u32 EADataSize;
153− __u32 EAKeyCount;
154− __u32 EAKeySize;
155− __u32 NSCreator;
156− __u8 nameLen;
157− __u8 entryName[256];
158− /* libncp may depend on there being nothing after entryName */
159−#ifdef __KERNEL__
160− struct nw_nfs_info nfs;
161−#endif
162−} __attribute__((packed));
163−
164−/* modify mask - use with MODIFY_DOS_INFO structure */
165−#define DM_ATTRIBUTES (cpu_to_le32(0x02))
166−#define DM_CREATE_DATE (cpu_to_le32(0x04))
167−#define DM_CREATE_TIME (cpu_to_le32(0x08))
168−#define DM_CREATOR_ID (cpu_to_le32(0x10))
169−#define DM_ARCHIVE_DATE (cpu_to_le32(0x20))
170−#define DM_ARCHIVE_TIME (cpu_to_le32(0x40))
171−#define DM_ARCHIVER_ID (cpu_to_le32(0x80))
172−#define DM_MODIFY_DATE (cpu_to_le32(0x0100))
173−#define DM_MODIFY_TIME (cpu_to_le32(0x0200))
174−#define DM_MODIFIER_ID (cpu_to_le32(0x0400))
175−#define DM_LAST_ACCESS_DATE (cpu_to_le32(0x0800))
176−#define DM_INHERITED_RIGHTS_MASK (cpu_to_le32(0x1000))
177−#define DM_MAXIMUM_SPACE (cpu_to_le32(0x2000))
178−
179−struct nw_modify_dos_info {
180− __le32 attributes;
181− __le16 creationDate;
182− __le16 creationTime;
183− __u32 creatorID;
184− __le16 modifyDate;
185− __le16 modifyTime;
186− __u32 modifierID;
187− __u16 archiveDate;
188− __u16 archiveTime;
189− __u32 archiverID;
190− __le16 lastAccessDate;
191− __u16 inheritanceGrantMask;
192− __u16 inheritanceRevokeMask;
193− __u32 maximumSpace;
194−} __attribute__((packed));
195−
196−struct nw_search_sequence {
197− __u8 volNumber;
198− __u32 dirBase;
199− __u32 sequence;
200−} __attribute__((packed));
201−
202−#endif /* _LINUX_NCP_H */
include/uapi/linux/ncp_fs.h+0−147
@@ -1,147 +0,0 @@
1−/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2−/*
3− * ncp_fs.h
4− *
5− * Copyright (C) 1995, 1996 by Volker Lendecke
6− *
7− */
8−
9−#ifndef _LINUX_NCP_FS_H
10−#define _LINUX_NCP_FS_H
11−
12−#include <linux/fs.h>
13−#include <linux/in.h>
14−#include <linux/types.h>
15−#include <linux/magic.h>
16−
17−#include <linux/ipx.h>
18−#include <linux/ncp_no.h>
19−
20−/*
21− * ioctl commands
22− */
23−
24−struct ncp_ioctl_request {
25− unsigned int function;
26− unsigned int size;
27− char __user *data;
28−};
29−
30−struct ncp_fs_info {
31− int version;
32− struct sockaddr_ipx addr;
33− __kernel_uid_t mounted_uid;
34− int connection; /* Connection number the server assigned us */
35− int buffer_size; /* The negotiated buffer size, to be
36− used for read/write requests! */
37−
38− int volume_number;
39− __le32 directory_id;
40−};
41−
42−struct ncp_fs_info_v2 {
43− int version;
44− unsigned long mounted_uid;
45− unsigned int connection;
46− unsigned int buffer_size;
47−
48− unsigned int volume_number;
49− __le32 directory_id;
50−
51− __u32 dummy1;
52− __u32 dummy2;
53− __u32 dummy3;
54−};
55−
56−struct ncp_sign_init
57−{
58− char sign_root[8];
59− char sign_last[16];
60−};
61−
62−struct ncp_lock_ioctl
63−{
64−#define NCP_LOCK_LOG 0
65−#define NCP_LOCK_SH 1
66−#define NCP_LOCK_EX 2
67−#define NCP_LOCK_CLEAR 256
68− int cmd;
69− int origin;
70− unsigned int offset;
71− unsigned int length;
72−#define NCP_LOCK_DEFAULT_TIMEOUT 18
73−#define NCP_LOCK_MAX_TIMEOUT 180
74− int timeout;
75−};
76−
77−struct ncp_setroot_ioctl
78−{
79− int volNumber;
80− int namespace;
81− __le32 dirEntNum;
82−};
83−
84−struct ncp_objectname_ioctl
85−{
86−#define NCP_AUTH_NONE 0x00
87−#define NCP_AUTH_BIND 0x31
88−#define NCP_AUTH_NDS 0x32
89− int auth_type;
90− size_t object_name_len;
91− void __user * object_name; /* a userspace data, in most cases user name */
92−};
93−
94−struct ncp_privatedata_ioctl
95−{
96− size_t len;
97− void __user * data; /* ~1000 for NDS */
98−};
99−
100−/* NLS charsets by ioctl */
101−#define NCP_IOCSNAME_LEN 20
102−struct ncp_nls_ioctl
103−{
104− unsigned char codepage[NCP_IOCSNAME_LEN+1];
105− unsigned char iocharset[NCP_IOCSNAME_LEN+1];
106−};
107−
108−#define NCP_IOC_NCPREQUEST _IOR('n', 1, struct ncp_ioctl_request)
109−#define NCP_IOC_GETMOUNTUID _IOW('n', 2, __kernel_old_uid_t)
110−#define NCP_IOC_GETMOUNTUID2 _IOW('n', 2, unsigned long)
111−
112−#define NCP_IOC_CONN_LOGGED_IN _IO('n', 3)
113−
114−#define NCP_GET_FS_INFO_VERSION (1)
115−#define NCP_IOC_GET_FS_INFO _IOWR('n', 4, struct ncp_fs_info)
116−#define NCP_GET_FS_INFO_VERSION_V2 (2)
117−#define NCP_IOC_GET_FS_INFO_V2 _IOWR('n', 4, struct ncp_fs_info_v2)
118−
119−#define NCP_IOC_SIGN_INIT _IOR('n', 5, struct ncp_sign_init)
120−#define NCP_IOC_SIGN_WANTED _IOR('n', 6, int)
121−#define NCP_IOC_SET_SIGN_WANTED _IOW('n', 6, int)
122−
123−#define NCP_IOC_LOCKUNLOCK _IOR('n', 7, struct ncp_lock_ioctl)
124−
125−#define NCP_IOC_GETROOT _IOW('n', 8, struct ncp_setroot_ioctl)
126−#define NCP_IOC_SETROOT _IOR('n', 8, struct ncp_setroot_ioctl)
127−
128−#define NCP_IOC_GETOBJECTNAME _IOWR('n', 9, struct ncp_objectname_ioctl)
129−#define NCP_IOC_SETOBJECTNAME _IOR('n', 9, struct ncp_objectname_ioctl)
130−#define NCP_IOC_GETPRIVATEDATA _IOWR('n', 10, struct ncp_privatedata_ioctl)
131−#define NCP_IOC_SETPRIVATEDATA _IOR('n', 10, struct ncp_privatedata_ioctl)
132−
133−#define NCP_IOC_GETCHARSETS _IOWR('n', 11, struct ncp_nls_ioctl)
134−#define NCP_IOC_SETCHARSETS _IOR('n', 11, struct ncp_nls_ioctl)
135−
136−#define NCP_IOC_GETDENTRYTTL _IOW('n', 12, __u32)
137−#define NCP_IOC_SETDENTRYTTL _IOR('n', 12, __u32)
138−
139−/*
140− * The packet size to allocate. One page should be enough.
141− */
142−#define NCP_PACKET_SIZE 4070
143−
144−#define NCP_MAXPATHLEN 255
145−#define NCP_MAXNAMELEN 14
146−
147−#endif /* _LINUX_NCP_FS_H */
include/uapi/linux/ncp_mount.h+0−72
@@ -1,72 +0,0 @@
1−/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2−/*
3− * ncp_mount.h
4− *
5− * Copyright (C) 1995, 1996 by Volker Lendecke
6− *
7− */
8−
9−#ifndef _LINUX_NCP_MOUNT_H
10−#define _LINUX_NCP_MOUNT_H
11−
12−#include <linux/types.h>
13−#include <linux/ncp.h>
14−
15−#define NCP_MOUNT_VERSION 3 /* Binary */
16−
17−/* Values for flags */
18−#define NCP_MOUNT_SOFT 0x0001
19−#define NCP_MOUNT_INTR 0x0002
20−#define NCP_MOUNT_STRONG 0x0004 /* enable delete/rename of r/o files */
21−#define NCP_MOUNT_NO_OS2 0x0008 /* do not use OS/2 (LONG) namespace */
22−#define NCP_MOUNT_NO_NFS 0x0010 /* do not use NFS namespace */
23−#define NCP_MOUNT_EXTRAS 0x0020
24−#define NCP_MOUNT_SYMLINKS 0x0040 /* enable symlinks */
25−#define NCP_MOUNT_NFS_EXTRAS 0x0080 /* Enable use of NFS NS meta-info */
26−
27−struct ncp_mount_data {
28− int version;
29− unsigned int ncp_fd; /* The socket to the ncp port */
30− __kernel_uid_t mounted_uid; /* Who may umount() this filesystem? */
31− __kernel_pid_t wdog_pid; /* Who cares for our watchdog packets? */
32−
33− unsigned char mounted_vol[NCP_VOLNAME_LEN + 1];
34− unsigned int time_out; /* How long should I wait after
35− sending a NCP request? */
36− unsigned int retry_count; /* And how often should I retry? */
37− unsigned int flags;
38−
39− __kernel_uid_t uid;
40− __kernel_gid_t gid;
41− __kernel_mode_t file_mode;
42− __kernel_mode_t dir_mode;
43−};
44−
45−#define NCP_MOUNT_VERSION_V4 (4) /* Binary or text */
46−
47−struct ncp_mount_data_v4 {
48− int version;
49− unsigned long flags; /* NCP_MOUNT_* flags */
50− /* MIPS uses long __kernel_uid_t, but... */
51− /* we neever pass -1, so it is safe */
52− unsigned long mounted_uid; /* Who may umount() this filesystem? */
53− /* MIPS uses long __kernel_pid_t */
54− long wdog_pid; /* Who cares for our watchdog packets? */
55−
56− unsigned int ncp_fd; /* The socket to the ncp port */
57− unsigned int time_out; /* How long should I wait after
58− sending a NCP request? */
59− unsigned int retry_count; /* And how often should I retry? */
60−
61− /* MIPS uses long __kernel_uid_t... */
62− /* we never pass -1, so it is safe */
63− unsigned long uid;
64− unsigned long gid;
65− /* MIPS uses unsigned long __kernel_mode_t */
66− unsigned long file_mode;
67− unsigned long dir_mode;
68−};
69−
70−#define NCP_MOUNT_VERSION_V5 (5) /* Text only */
71−
72−#endif
include/uapi/linux/ncp_no.h+0−20
@@ -1,20 +0,0 @@
1−/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2−#ifndef _NCP_NO
3−#define _NCP_NO
4−
5−/* these define the attribute byte as seen by NCP */
6−#define aRONLY (__cpu_to_le32(1))
7−#define aHIDDEN (__cpu_to_le32(2))
8−#define aSYSTEM (__cpu_to_le32(4))
9−#define aEXECUTE (__cpu_to_le32(8))
10−#define aDIR (__cpu_to_le32(0x10))
11−#define aARCH (__cpu_to_le32(0x20))
12−#define aSHARED (__cpu_to_le32(0x80))
13−#define aDONTSUBALLOCATE (__cpu_to_le32(1L<<11))
14−#define aTRANSACTIONAL (__cpu_to_le32(1L<<12))
15−#define aPURGE (__cpu_to_le32(1L<<16))
16−#define aRENAMEINHIBIT (__cpu_to_le32(1L<<17))
17−#define aDELETEINHIBIT (__cpu_to_le32(1L<<18))
18−#define aDONTCOMPRESS (__cpu_to_le32(1L<<27))
19−
20−#endif /* _NCP_NO */