History

Merge v3.7-rc5 into tty-next

This pulls in the 3.7-rc5 fixes into tty-next to make it easier to test.

Greg Kroah-Hartman committed 14 years ago

Commit 54d5f882 parents 76cc438 77b6706388 files · +3861 −2313Browse files

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

Unified · Split

4 files
  1. include/uapi/linux/eventpoll.h +0 −1
  2. include/uapi/linux/raid/Kbuild +2 −0
  3. include/uapi/linux/raid/md_p.h +301 −0
  4. include/uapi/linux/raid/md_u.h +155 −0
include/uapi/linux/eventpoll.h+0−1
@@ -25,7 +25,6 @@ · 24 unmodified lines
2525 #define EPOLL_CTL_ADD 1
2626 #define EPOLL_CTL_DEL 2
2727 #define EPOLL_CTL_MOD 3
28−#define EPOLL_CTL_DISABLE 4
2928
3029 /*
3130 * Request the handling of system wakeup events so as to prevent system suspends
include/uapi/linux/raid/Kbuild+2−0
@@ -1 +1,3 @@
11 # UAPI Header export list
2+header-y += md_p.h
3+header-y += md_u.h
include/uapi/linux/raid/md_p.h+301−0
@@ -0,0 +1,301 @@
1+/*
2+ md_p.h : physical layout of Linux RAID devices
3+ Copyright (C) 1996-98 Ingo Molnar, Gadi Oxman
4+
5+ This program is free software; you can redistribute it and/or modify
6+ it under the terms of the GNU General Public License as published by
7+ the Free Software Foundation; either version 2, or (at your option)
8+ any later version.
9+
10+ You should have received a copy of the GNU General Public License
11+ (for example /usr/src/linux/COPYING); if not, write to the Free
12+ Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
13+*/
14+
15+#ifndef _MD_P_H
16+#define _MD_P_H
17+
18+#include <linux/types.h>
19+
20+/*
21+ * RAID superblock.
22+ *
23+ * The RAID superblock maintains some statistics on each RAID configuration.
24+ * Each real device in the RAID set contains it near the end of the device.
25+ * Some of the ideas are copied from the ext2fs implementation.
26+ *
27+ * We currently use 4096 bytes as follows:
28+ *
29+ * word offset function
30+ *
31+ * 0 - 31 Constant generic RAID device information.
32+ * 32 - 63 Generic state information.
33+ * 64 - 127 Personality specific information.
34+ * 128 - 511 12 32-words descriptors of the disks in the raid set.
35+ * 512 - 911 Reserved.
36+ * 912 - 1023 Disk specific descriptor.
37+ */
38+
39+/*
40+ * If x is the real device size in bytes, we return an apparent size of:
41+ *
42+ * y = (x & ~(MD_RESERVED_BYTES - 1)) - MD_RESERVED_BYTES
43+ *
44+ * and place the 4kB superblock at offset y.
45+ */
46+#define MD_RESERVED_BYTES (64 * 1024)
47+#define MD_RESERVED_SECTORS (MD_RESERVED_BYTES / 512)
48+
49+#define MD_NEW_SIZE_SECTORS(x) ((x & ~(MD_RESERVED_SECTORS - 1)) - MD_RESERVED_SECTORS)
50+
51+#define MD_SB_BYTES 4096
52+#define MD_SB_WORDS (MD_SB_BYTES / 4)
53+#define MD_SB_SECTORS (MD_SB_BYTES / 512)
54+
55+/*
56+ * The following are counted in 32-bit words
57+ */
58+#define MD_SB_GENERIC_OFFSET 0
59+#define MD_SB_PERSONALITY_OFFSET 64
60+#define MD_SB_DISKS_OFFSET 128
61+#define MD_SB_DESCRIPTOR_OFFSET 992
62+
63+#define MD_SB_GENERIC_CONSTANT_WORDS 32
64+#define MD_SB_GENERIC_STATE_WORDS 32
65+#define MD_SB_GENERIC_WORDS (MD_SB_GENERIC_CONSTANT_WORDS + MD_SB_GENERIC_STATE_WORDS)
66+#define MD_SB_PERSONALITY_WORDS 64
67+#define MD_SB_DESCRIPTOR_WORDS 32
68+#define MD_SB_DISKS 27
69+#define MD_SB_DISKS_WORDS (MD_SB_DISKS*MD_SB_DESCRIPTOR_WORDS)
70+#define MD_SB_RESERVED_WORDS (1024 - MD_SB_GENERIC_WORDS - MD_SB_PERSONALITY_WORDS - MD_SB_DISKS_WORDS - MD_SB_DESCRIPTOR_WORDS)
71+#define MD_SB_EQUAL_WORDS (MD_SB_GENERIC_WORDS + MD_SB_PERSONALITY_WORDS + MD_SB_DISKS_WORDS)
72+
73+/*
74+ * Device "operational" state bits
75+ */
76+#define MD_DISK_FAULTY 0 /* disk is faulty / operational */
77+#define MD_DISK_ACTIVE 1 /* disk is running or spare disk */
78+#define MD_DISK_SYNC 2 /* disk is in sync with the raid set */
79+#define MD_DISK_REMOVED 3 /* disk is in sync with the raid set */
80+
81+#define MD_DISK_WRITEMOSTLY 9 /* disk is "write-mostly" is RAID1 config.
82+ * read requests will only be sent here in
83+ * dire need
84+ */
85+
86+typedef struct mdp_device_descriptor_s {
87+ __u32 number; /* 0 Device number in the entire set */
88+ __u32 major; /* 1 Device major number */
89+ __u32 minor; /* 2 Device minor number */
90+ __u32 raid_disk; /* 3 The role of the device in the raid set */
91+ __u32 state; /* 4 Operational state */
92+ __u32 reserved[MD_SB_DESCRIPTOR_WORDS - 5];
93+} mdp_disk_t;
94+
95+#define MD_SB_MAGIC 0xa92b4efc
96+
97+/*
98+ * Superblock state bits
99+ */
100+#define MD_SB_CLEAN 0
101+#define MD_SB_ERRORS 1
102+
103+#define MD_SB_BITMAP_PRESENT 8 /* bitmap may be present nearby */
104+
105+/*
106+ * Notes:
107+ * - if an array is being reshaped (restriped) in order to change the
108+ * the number of active devices in the array, 'raid_disks' will be
109+ * the larger of the old and new numbers. 'delta_disks' will
110+ * be the "new - old". So if +ve, raid_disks is the new value, and
111+ * "raid_disks-delta_disks" is the old. If -ve, raid_disks is the
112+ * old value and "raid_disks+delta_disks" is the new (smaller) value.
113+ */
114+
115+
116+typedef struct mdp_superblock_s {
117+ /*
118+ * Constant generic information
119+ */
120+ __u32 md_magic; /* 0 MD identifier */
121+ __u32 major_version; /* 1 major version to which the set conforms */
122+ __u32 minor_version; /* 2 minor version ... */
123+ __u32 patch_version; /* 3 patchlevel version ... */
124+ __u32 gvalid_words; /* 4 Number of used words in this section */
125+ __u32 set_uuid0; /* 5 Raid set identifier */
126+ __u32 ctime; /* 6 Creation time */
127+ __u32 level; /* 7 Raid personality */
128+ __u32 size; /* 8 Apparent size of each individual disk */
129+ __u32 nr_disks; /* 9 total disks in the raid set */
130+ __u32 raid_disks; /* 10 disks in a fully functional raid set */
131+ __u32 md_minor; /* 11 preferred MD minor device number */
132+ __u32 not_persistent; /* 12 does it have a persistent superblock */
133+ __u32 set_uuid1; /* 13 Raid set identifier #2 */
134+ __u32 set_uuid2; /* 14 Raid set identifier #3 */
135+ __u32 set_uuid3; /* 15 Raid set identifier #4 */
136+ __u32 gstate_creserved[MD_SB_GENERIC_CONSTANT_WORDS - 16];
137+
138+ /*
139+ * Generic state information
140+ */
141+ __u32 utime; /* 0 Superblock update time */
142+ __u32 state; /* 1 State bits (clean, ...) */
143+ __u32 active_disks; /* 2 Number of currently active disks */
144+ __u32 working_disks; /* 3 Number of working disks */
145+ __u32 failed_disks; /* 4 Number of failed disks */
146+ __u32 spare_disks; /* 5 Number of spare disks */
147+ __u32 sb_csum; /* 6 checksum of the whole superblock */
148+#ifdef __BIG_ENDIAN
149+ __u32 events_hi; /* 7 high-order of superblock update count */
150+ __u32 events_lo; /* 8 low-order of superblock update count */
151+ __u32 cp_events_hi; /* 9 high-order of checkpoint update count */
152+ __u32 cp_events_lo; /* 10 low-order of checkpoint update count */
153+#else
154+ __u32 events_lo; /* 7 low-order of superblock update count */
155+ __u32 events_hi; /* 8 high-order of superblock update count */
156+ __u32 cp_events_lo; /* 9 low-order of checkpoint update count */
157+ __u32 cp_events_hi; /* 10 high-order of checkpoint update count */
158+#endif
159+ __u32 recovery_cp; /* 11 recovery checkpoint sector count */
160+ /* There are only valid for minor_version > 90 */
161+ __u64 reshape_position; /* 12,13 next address in array-space for reshape */
162+ __u32 new_level; /* 14 new level we are reshaping to */
163+ __u32 delta_disks; /* 15 change in number of raid_disks */
164+ __u32 new_layout; /* 16 new layout */
165+ __u32 new_chunk; /* 17 new chunk size (bytes) */
166+ __u32 gstate_sreserved[MD_SB_GENERIC_STATE_WORDS - 18];
167+
168+ /*
169+ * Personality information
170+ */
171+ __u32 layout; /* 0 the array's physical layout */
172+ __u32 chunk_size; /* 1 chunk size in bytes */
173+ __u32 root_pv; /* 2 LV root PV */
174+ __u32 root_block; /* 3 LV root block */
175+ __u32 pstate_reserved[MD_SB_PERSONALITY_WORDS - 4];
176+
177+ /*
178+ * Disks information
179+ */
180+ mdp_disk_t disks[MD_SB_DISKS];
181+
182+ /*
183+ * Reserved
184+ */
185+ __u32 reserved[MD_SB_RESERVED_WORDS];
186+
187+ /*
188+ * Active descriptor
189+ */
190+ mdp_disk_t this_disk;
191+
192+} mdp_super_t;
193+
194+static inline __u64 md_event(mdp_super_t *sb) {
195+ __u64 ev = sb->events_hi;
196+ return (ev<<32)| sb->events_lo;
197+}
198+
199+#define MD_SUPERBLOCK_1_TIME_SEC_MASK ((1ULL<<40) - 1)
200+
201+/*
202+ * The version-1 superblock :
203+ * All numeric fields are little-endian.
204+ *
205+ * total size: 256 bytes plus 2 per device.
206+ * 1K allows 384 devices.
207+ */
208+struct mdp_superblock_1 {
209+ /* constant array information - 128 bytes */
210+ __le32 magic; /* MD_SB_MAGIC: 0xa92b4efc - little endian */
211+ __le32 major_version; /* 1 */
212+ __le32 feature_map; /* bit 0 set if 'bitmap_offset' is meaningful */
213+ __le32 pad0; /* always set to 0 when writing */
214+
215+ __u8 set_uuid[16]; /* user-space generated. */
216+ char set_name[32]; /* set and interpreted by user-space */
217+
218+ __le64 ctime; /* lo 40 bits are seconds, top 24 are microseconds or 0*/
219+ __le32 level; /* -4 (multipath), -1 (linear), 0,1,4,5 */
220+ __le32 layout; /* only for raid5 and raid10 currently */
221+ __le64 size; /* used size of component devices, in 512byte sectors */
222+
223+ __le32 chunksize; /* in 512byte sectors */
224+ __le32 raid_disks;
225+ __le32 bitmap_offset; /* sectors after start of superblock that bitmap starts
226+ * NOTE: signed, so bitmap can be before superblock
227+ * only meaningful of feature_map[0] is set.
228+ */
229+
230+ /* These are only valid with feature bit '4' */
231+ __le32 new_level; /* new level we are reshaping to */
232+ __le64 reshape_position; /* next address in array-space for reshape */
233+ __le32 delta_disks; /* change in number of raid_disks */
234+ __le32 new_layout; /* new layout */
235+ __le32 new_chunk; /* new chunk size (512byte sectors) */
236+ __le32 new_offset; /* signed number to add to data_offset in new
237+ * layout. 0 == no-change. This can be
238+ * different on each device in the array.
239+ */
240+
241+ /* constant this-device information - 64 bytes */
242+ __le64 data_offset; /* sector start of data, often 0 */
243+ __le64 data_size; /* sectors in this device that can be used for data */
244+ __le64 super_offset; /* sector start of this superblock */
245+ __le64 recovery_offset;/* sectors before this offset (from data_offset) have been recovered */
246+ __le32 dev_number; /* permanent identifier of this device - not role in raid */
247+ __le32 cnt_corrected_read; /* number of read errors that were corrected by re-writing */
248+ __u8 device_uuid[16]; /* user-space setable, ignored by kernel */
249+ __u8 devflags; /* per-device flags. Only one defined...*/
250+#define WriteMostly1 1 /* mask for writemostly flag in above */
251+ /* Bad block log. If there are any bad blocks the feature flag is set.
252+ * If offset and size are non-zero, that space is reserved and available
253+ */
254+ __u8 bblog_shift; /* shift from sectors to block size */
255+ __le16 bblog_size; /* number of sectors reserved for list */
256+ __le32 bblog_offset; /* sector offset from superblock to bblog,
257+ * signed - not unsigned */
258+
259+ /* array state information - 64 bytes */
260+ __le64 utime; /* 40 bits second, 24 bits microseconds */
261+ __le64 events; /* incremented when superblock updated */
262+ __le64 resync_offset; /* data before this offset (from data_offset) known to be in sync */
263+ __le32 sb_csum; /* checksum up to devs[max_dev] */
264+ __le32 max_dev; /* size of devs[] array to consider */
265+ __u8 pad3[64-32]; /* set to 0 when writing */
266+
267+ /* device state information. Indexed by dev_number.
268+ * 2 bytes per device
269+ * Note there are no per-device state flags. State information is rolled
270+ * into the 'roles' value. If a device is spare or faulty, then it doesn't
271+ * have a meaningful role.
272+ */
273+ __le16 dev_roles[0]; /* role in array, or 0xffff for a spare, or 0xfffe for faulty */
274+};
275+
276+/* feature_map bits */
277+#define MD_FEATURE_BITMAP_OFFSET 1
278+#define MD_FEATURE_RECOVERY_OFFSET 2 /* recovery_offset is present and
279+ * must be honoured
280+ */
281+#define MD_FEATURE_RESHAPE_ACTIVE 4
282+#define MD_FEATURE_BAD_BLOCKS 8 /* badblock list is not empty */
283+#define MD_FEATURE_REPLACEMENT 16 /* This device is replacing an
284+ * active device with same 'role'.
285+ * 'recovery_offset' is also set.
286+ */
287+#define MD_FEATURE_RESHAPE_BACKWARDS 32 /* Reshape doesn't change number
288+ * of devices, but is going
289+ * backwards anyway.
290+ */
291+#define MD_FEATURE_NEW_OFFSET 64 /* new_offset must be honoured */
292+#define MD_FEATURE_ALL (MD_FEATURE_BITMAP_OFFSET \
293+ |MD_FEATURE_RECOVERY_OFFSET \
294+ |MD_FEATURE_RESHAPE_ACTIVE \
295+ |MD_FEATURE_BAD_BLOCKS \
296+ |MD_FEATURE_REPLACEMENT \
297+ |MD_FEATURE_RESHAPE_BACKWARDS \
298+ |MD_FEATURE_NEW_OFFSET \
299+ )
300+
301+#endif
include/uapi/linux/raid/md_u.h+155−0
@@ -0,0 +1,155 @@
1+/*
2+ md_u.h : user <=> kernel API between Linux raidtools and RAID drivers
3+ Copyright (C) 1998 Ingo Molnar
4+
5+ This program is free software; you can redistribute it and/or modify
6+ it under the terms of the GNU General Public License as published by
7+ the Free Software Foundation; either version 2, or (at your option)
8+ any later version.
9+
10+ You should have received a copy of the GNU General Public License
11+ (for example /usr/src/linux/COPYING); if not, write to the Free
12+ Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
13+*/
14+
15+#ifndef _UAPI_MD_U_H
16+#define _UAPI_MD_U_H
17+
18+/*
19+ * Different major versions are not compatible.
20+ * Different minor versions are only downward compatible.
21+ * Different patchlevel versions are downward and upward compatible.
22+ */
23+#define MD_MAJOR_VERSION 0
24+#define MD_MINOR_VERSION 90
25+/*
26+ * MD_PATCHLEVEL_VERSION indicates kernel functionality.
27+ * >=1 means different superblock formats are selectable using SET_ARRAY_INFO
28+ * and major_version/minor_version accordingly
29+ * >=2 means that Internal bitmaps are supported by setting MD_SB_BITMAP_PRESENT
30+ * in the super status byte
31+ * >=3 means that bitmap superblock version 4 is supported, which uses
32+ * little-ending representation rather than host-endian
33+ */
34+#define MD_PATCHLEVEL_VERSION 3
35+
36+/* ioctls */
37+
38+/* status */
39+#define RAID_VERSION _IOR (MD_MAJOR, 0x10, mdu_version_t)
40+#define GET_ARRAY_INFO _IOR (MD_MAJOR, 0x11, mdu_array_info_t)
41+#define GET_DISK_INFO _IOR (MD_MAJOR, 0x12, mdu_disk_info_t)
42+#define PRINT_RAID_DEBUG _IO (MD_MAJOR, 0x13)
43+#define RAID_AUTORUN _IO (MD_MAJOR, 0x14)
44+#define GET_BITMAP_FILE _IOR (MD_MAJOR, 0x15, mdu_bitmap_file_t)
45+
46+/* configuration */
47+#define CLEAR_ARRAY _IO (MD_MAJOR, 0x20)
48+#define ADD_NEW_DISK _IOW (MD_MAJOR, 0x21, mdu_disk_info_t)
49+#define HOT_REMOVE_DISK _IO (MD_MAJOR, 0x22)
50+#define SET_ARRAY_INFO _IOW (MD_MAJOR, 0x23, mdu_array_info_t)
51+#define SET_DISK_INFO _IO (MD_MAJOR, 0x24)
52+#define WRITE_RAID_INFO _IO (MD_MAJOR, 0x25)
53+#define UNPROTECT_ARRAY _IO (MD_MAJOR, 0x26)
54+#define PROTECT_ARRAY _IO (MD_MAJOR, 0x27)
55+#define HOT_ADD_DISK _IO (MD_MAJOR, 0x28)
56+#define SET_DISK_FAULTY _IO (MD_MAJOR, 0x29)
57+#define HOT_GENERATE_ERROR _IO (MD_MAJOR, 0x2a)
58+#define SET_BITMAP_FILE _IOW (MD_MAJOR, 0x2b, int)
59+
60+/* usage */
61+#define RUN_ARRAY _IOW (MD_MAJOR, 0x30, mdu_param_t)
62+/* 0x31 was START_ARRAY */
63+#define STOP_ARRAY _IO (MD_MAJOR, 0x32)
64+#define STOP_ARRAY_RO _IO (MD_MAJOR, 0x33)
65+#define RESTART_ARRAY_RW _IO (MD_MAJOR, 0x34)
66+
67+/* 63 partitions with the alternate major number (mdp) */
68+#define MdpMinorShift 6
69+
70+typedef struct mdu_version_s {
71+ int major;
72+ int minor;
73+ int patchlevel;
74+} mdu_version_t;
75+
76+typedef struct mdu_array_info_s {
77+ /*
78+ * Generic constant information
79+ */
80+ int major_version;
81+ int minor_version;
82+ int patch_version;
83+ int ctime;
84+ int level;
85+ int size;
86+ int nr_disks;
87+ int raid_disks;
88+ int md_minor;
89+ int not_persistent;
90+
91+ /*
92+ * Generic state information
93+ */
94+ int utime; /* 0 Superblock update time */
95+ int state; /* 1 State bits (clean, ...) */
96+ int active_disks; /* 2 Number of currently active disks */
97+ int working_disks; /* 3 Number of working disks */
98+ int failed_disks; /* 4 Number of failed disks */
99+ int spare_disks; /* 5 Number of spare disks */
100+
101+ /*
102+ * Personality information
103+ */
104+ int layout; /* 0 the array's physical layout */
105+ int chunk_size; /* 1 chunk size in bytes */
106+
107+} mdu_array_info_t;
108+
109+/* non-obvious values for 'level' */
110+#define LEVEL_MULTIPATH (-4)
111+#define LEVEL_LINEAR (-1)
112+#define LEVEL_FAULTY (-5)
113+
114+/* we need a value for 'no level specified' and 0
115+ * means 'raid0', so we need something else. This is
116+ * for internal use only
117+ */
118+#define LEVEL_NONE (-1000000)
119+
120+typedef struct mdu_disk_info_s {
121+ /*
122+ * configuration/status of one particular disk
123+ */
124+ int number;
125+ int major;
126+ int minor;
127+ int raid_disk;
128+ int state;
129+
130+} mdu_disk_info_t;
131+
132+typedef struct mdu_start_info_s {
133+ /*
134+ * configuration/status of one particular disk
135+ */
136+ int major;
137+ int minor;
138+ int raid_disk;
139+ int state;
140+
141+} mdu_start_info_t;
142+
143+typedef struct mdu_bitmap_file_s
144+{
145+ char pathname[4096];
146+} mdu_bitmap_file_t;
147+
148+typedef struct mdu_param_s
149+{
150+ int personality; /* 1,2,3,4 */
151+ int chunk_size; /* in bytes */
152+ int max_fault; /* unused for now */
153+} mdu_param_t;
154+
155+#endif /* _UAPI_MD_U_H */