History

Merge branch 'md-next' into md-linus

Shaohua Li committed 9 years ago

Commit 20737732 parents b78b499 295307916 files · +3429 −1262Browse files

Showing the changes to include/uapi/linux (1 of 16 files). Show all

Unified · Split

include/uapi/linux/raid/md_p.h+6−1
@@ -84,6 +84,10 @@ · 83 unmodified lines
84#define MD_DISK_CANDIDATE 5 /* disk is added as spare (local) until confirmed84#define MD_DISK_CANDIDATE 5 /* disk is added as spare (local) until confirmed
85 * For clustered enviroments only.85 * For clustered enviroments only.
86 */86 */
87#define MD_DISK_FAILFAST 10 /* Send REQ_FAILFAST if there are multiple
88 * devices available - and don't try to
89 * correct read errors.
90 */
87 91
88#define MD_DISK_WRITEMOSTLY 9 /* disk is "write-mostly" is RAID1 config.92#define MD_DISK_WRITEMOSTLY 9 /* disk is "write-mostly" is RAID1 config.
89 * read requests will only be sent here in93 * read requests will only be sent here in
@@ -265,8 +269,9 @@ struct mdp_superblock_1 { · 175 unmodified lines
265 __le32 dev_number; /* permanent identifier of this device - not role in raid */269 __le32 dev_number; /* permanent identifier of this device - not role in raid */
266 __le32 cnt_corrected_read; /* number of read errors that were corrected by re-writing */270 __le32 cnt_corrected_read; /* number of read errors that were corrected by re-writing */
267 __u8 device_uuid[16]; /* user-space setable, ignored by kernel */271 __u8 device_uuid[16]; /* user-space setable, ignored by kernel */
268 __u8 devflags; /* per-device flags. Only one defined...*/272 __u8 devflags; /* per-device flags. Only two defined...*/
269#define WriteMostly1 1 /* mask for writemostly flag in above */273#define WriteMostly1 1 /* mask for writemostly flag in above */
274#define FailFast1 2 /* Should avoid retries and fixups and just fail */
270 /* Bad block log. If there are any bad blocks the feature flag is set.275 /* Bad block log. If there are any bad blocks the feature flag is set.
271 * If offset and size are non-zero, that space is reserved and available276 * If offset and size are non-zero, that space is reserved and available
272 */277 */