X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=mdadm.h;h=83a7944b58d13dade07035319bb9761ea08a8fee;hp=5be3affe073a9c2e425c1116543bd6c86d9d12fa;hb=a7c6e3fb24f8335005a6ff8e0eb668faa257c941;hpb=6c40598f598874d1d4c2c4d0da0c2a9b873d768d

diff --git a/mdadm.h b/mdadm.h
index 5be3affe..83a7944b 100644
--- a/mdadm.h
+++ b/mdadm.h
@@ -334,22 +334,24 @@ extern int map_lock(struct map_ent **melp);
 extern void map_unlock(struct map_ent **melp);
 
 /* various details can be requested */
-#define	GET_LEVEL	1
-#define	GET_LAYOUT	2
-#define	GET_COMPONENT	4
-#define	GET_CHUNK	8
-#define GET_CACHE	16
-#define	GET_MISMATCH	32
-#define	GET_VERSION	64
-#define	GET_DISKS	128
-#define	GET_DEGRADED	256
-#define	GET_SAFEMODE	512
-
-#define	GET_DEVS	1024 /* gets role, major, minor */
-#define	GET_OFFSET	2048
-#define	GET_SIZE	4096
-#define	GET_STATE	8192
-#define	GET_ERROR	16384
+enum sysfs_read_flags {
+	GET_LEVEL	= (1 << 0),
+	GET_LAYOUT	= (1 << 1),
+	GET_COMPONENT	= (1 << 2),
+	GET_CHUNK	= (1 << 3),
+	GET_CACHE	= (1 << 4),
+	GET_MISMATCH	= (1 << 5),
+	GET_VERSION	= (1 << 6),
+	GET_DISKS	= (1 << 7),
+	GET_DEGRADED	= (1 << 8),
+	GET_SAFEMODE	= (1 << 9),
+	GET_DEVS	= (1 << 10), /* gets role, major, minor */
+	GET_OFFSET	= (1 << 11),
+	GET_SIZE	= (1 << 12),
+	GET_STATE	= (1 << 13),
+	GET_ERROR	= (1 << 14),
+	SKIP_GONE_DEVS	= (1 << 15),
+};
 
 /* If fd >= 0, get the array it is open on,
  * else use devnum. >=0 -> major9. <0.....
@@ -367,6 +369,8 @@ extern int sysfs_set_num(struct mdinfo *sra, struct mdinfo *dev,
 extern int sysfs_uevent(struct mdinfo *sra, char *event);
 extern int sysfs_get_ll(struct mdinfo *sra, struct mdinfo *dev,
 			char *name, unsigned long long *val);
+extern int sysfs_get_str(struct mdinfo *sra, struct mdinfo *dev,
+			 char *name, char *val, int size);
 extern int sysfs_set_safemode(struct mdinfo *sra, unsigned long ms);
 extern int sysfs_set_array(struct mdinfo *info, int vers);
 extern int sysfs_add_disk(struct mdinfo *sra, struct mdinfo *sd);
@@ -392,7 +396,7 @@ extern int restore_stripes(int *dest, unsigned long long *offsets,
 
 extern char *map_num(mapping_t *map, int num);
 extern int map_name(mapping_t *map, char *name);
-extern mapping_t r5layout[], pers[], modes[], faultylayout[];
+extern mapping_t r5layout[], r6layout[], pers[], modes[], faultylayout[];
 
 extern char *map_dev(int major, int minor, int create);
 
@@ -653,7 +657,7 @@ extern struct supertype *dup_super(struct supertype *st);
 extern int get_dev_size(int fd, char *dname, unsigned long long *sizep);
 extern void get_one_disk(int mdfd, mdu_array_info_t *ainf,
 			 mdu_disk_info_t *disk);
-void wait_for(char *dev);
+void wait_for(char *dev, int fd);
 
 #if __GNUC__ < 3
 struct stat64;
@@ -935,8 +939,44 @@ static inline int xasprintf(char **strp, const char *fmt, ...) {
 #define makedev(M,m) (((M)<<8) | (m))
 #endif
 
-/* for raid5 */
+/* for raid4/5/6 */
 #define ALGORITHM_LEFT_ASYMMETRIC	0
 #define ALGORITHM_RIGHT_ASYMMETRIC	1
 #define ALGORITHM_LEFT_SYMMETRIC	2
 #define ALGORITHM_RIGHT_SYMMETRIC	3
+
+/* Define non-rotating (raid4) algorithms.  These allow
+ * conversion of raid4 to raid5.
+ */
+#define ALGORITHM_PARITY_0		4 /* P or P,Q are initial devices */
+#define ALGORITHM_PARITY_N		5 /* P or P,Q are final devices. */
+
+/* DDF RAID6 layouts differ from md/raid6 layouts in two ways.
+ * Firstly, the exact positioning of the parity block is slightly
+ * different between the 'LEFT_*' modes of md and the "_N_*" modes
+ * of DDF.
+ * Secondly, or order of datablocks over which the Q syndrome is computed
+ * is different.
+ * Consequently we have different layouts for DDF/raid6 than md/raid6.
+ * These layouts are from the DDFv1.2 spec.
+ * Interestingly DDFv1.2-Errata-A does not specify N_CONTINUE but
+ * leaves RLQ=3 as 'Vendor Specific'
+ */
+
+#define ALGORITHM_ROTATING_ZERO_RESTART	8 /* DDF PRL=6 RLQ=1 */
+#define ALGORITHM_ROTATING_N_RESTART	9 /* DDF PRL=6 RLQ=2 */
+#define ALGORITHM_ROTATING_N_CONTINUE	10 /*DDF PRL=6 RLQ=3 */
+
+
+/* For every RAID5 algorithm we define a RAID6 algorithm
+ * with exactly the same layout for data and parity, and
+ * with the Q block always on the last device (N-1).
+ * This allows trivial conversion from RAID5 to RAID6
+ */
+#define ALGORITHM_LEFT_ASYMMETRIC_6	16
+#define ALGORITHM_RIGHT_ASYMMETRIC_6	17
+#define ALGORITHM_LEFT_SYMMETRIC_6	18
+#define ALGORITHM_RIGHT_SYMMETRIC_6	19
+#define ALGORITHM_PARITY_0_6		20
+#define ALGORITHM_PARITY_N_6		ALGORITHM_PARITY_N
+