diff options
| author | NeilBrown <neilb@suse.de> | 2015-04-22 08:00:20 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2015-04-22 08:00:20 +1000 |
| commit | d51e4fe6d68098d4361a6b6d41d8da727b1f1af4 (patch) | |
| tree | 6c070a877db9697a2b68e84b2b2d0aa299bb6216 /include | |
| parent | 47d68979cc968535cb87f3e5f2e6a3533ea48fbd (diff) | |
| parent | 97f6cd39da227459cb46ed4088d37d5d8db51c50 (diff) | |
| download | lwn-d51e4fe6d68098d4361a6b6d41d8da727b1f1af4.tar.gz lwn-d51e4fe6d68098d4361a6b6d41d8da727b1f1af4.zip | |
Merge branch 'cluster' into for-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/raid/md_p.h | 7 | ||||
| -rw-r--r-- | include/uapi/linux/raid/md_u.h | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/uapi/linux/raid/md_p.h b/include/uapi/linux/raid/md_p.h index 49f4210d4394..2ae6131e69a5 100644 --- a/include/uapi/linux/raid/md_p.h +++ b/include/uapi/linux/raid/md_p.h @@ -78,6 +78,12 @@ #define MD_DISK_ACTIVE 1 /* disk is running or spare disk */ #define MD_DISK_SYNC 2 /* disk is in sync with the raid set */ #define MD_DISK_REMOVED 3 /* disk is in sync with the raid set */ +#define MD_DISK_CLUSTER_ADD 4 /* Initiate a disk add across the cluster + * For clustered enviroments only. + */ +#define MD_DISK_CANDIDATE 5 /* disk is added as spare (local) until confirmed + * For clustered enviroments only. + */ #define MD_DISK_WRITEMOSTLY 9 /* disk is "write-mostly" is RAID1 config. * read requests will only be sent here in @@ -101,6 +107,7 @@ typedef struct mdp_device_descriptor_s { #define MD_SB_CLEAN 0 #define MD_SB_ERRORS 1 +#define MD_SB_CLUSTERED 5 /* MD is clustered */ #define MD_SB_BITMAP_PRESENT 8 /* bitmap may be present nearby */ /* diff --git a/include/uapi/linux/raid/md_u.h b/include/uapi/linux/raid/md_u.h index 74e7c60c4716..1cb8aa6850b5 100644 --- a/include/uapi/linux/raid/md_u.h +++ b/include/uapi/linux/raid/md_u.h @@ -62,6 +62,7 @@ #define STOP_ARRAY _IO (MD_MAJOR, 0x32) #define STOP_ARRAY_RO _IO (MD_MAJOR, 0x33) #define RESTART_ARRAY_RW _IO (MD_MAJOR, 0x34) +#define CLUSTERED_DISK_NACK _IO (MD_MAJOR, 0x35) /* 63 partitions with the alternate major number (mdp) */ #define MdpMinorShift 6 |