X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=mdadm.h;h=399478b86c1ab07ef2e48146341bd51c1cf6788d;hp=084bc970692eba5ab22212f06849aeb3f7cb56f3;hb=1c294b5d960abeeb9e0f188af294d019bc82b20e;hpb=018a488238e2ff55d7c2fd29333c1f7305354318 diff --git a/mdadm.h b/mdadm.h index 084bc970..399478b8 100644 --- a/mdadm.h +++ b/mdadm.h @@ -45,10 +45,8 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence)); #include #include #include -#ifdef __GLIBC__ /* Newer glibc requires sys/sysmacros.h directly for makedev() */ #include -#endif #ifdef __dietlibc__ #include /* dietlibc has deprecated random and srandom!! */ @@ -191,6 +189,36 @@ struct dlm_lksb { #endif #endif /* __KLIBC__ */ +/* + * Partially stolen from include/linux/unaligned/packed_struct.h + */ +struct __una_u16 { __u16 x; } __attribute__ ((packed)); +struct __una_u32 { __u32 x; } __attribute__ ((packed)); + +static inline __u16 __get_unaligned16(const void *p) +{ + const struct __una_u16 *ptr = (const struct __una_u16 *)p; + return ptr->x; +} + +static inline __u32 __get_unaligned32(const void *p) +{ + const struct __una_u32 *ptr = (const struct __una_u32 *)p; + return ptr->x; +} + +static inline void __put_unaligned16(__u16 val, void *p) +{ + struct __una_u16 *ptr = (struct __una_u16 *)p; + ptr->x = val; +} + +static inline void __put_unaligned32(__u32 val, void *p) +{ + struct __una_u32 *ptr = (struct __una_u32 *)p; + ptr->x = val; +} + /* * Check at compile time that something is of a particular type. * Always evaluates to 1 so you may use it easily in comparisons. @@ -335,8 +363,19 @@ struct mdinfo { int prev_state, curr_state, next_state; /* info read from sysfs */ - char sysfs_array_state[20]; - + enum { + ARRAY_CLEAR, + ARRAY_INACTIVE, + ARRAY_SUSPENDED, + ARRAY_READONLY, + ARRAY_READ_AUTO, + ARRAY_CLEAN, + ARRAY_ACTIVE, + ARRAY_WRITE_PENDING, + ARRAY_ACTIVE_IDLE, + ARRAY_BROKEN, + ARRAY_UNKNOWN_STATE, + } array_state; struct md_bb bb; }; @@ -351,6 +390,11 @@ struct createinfo { struct supertype *supertype; }; +struct spare_criteria { + unsigned long long min_size; + unsigned int sector_size; +}; + enum mode { ASSEMBLE=1, BUILD, @@ -397,6 +441,7 @@ enum special_options { NoSharing, HelpOptions, Brief, + NoDevices, ManageOpt, Add, AddSpare, @@ -507,6 +552,7 @@ struct context { int runstop; int verbose; int brief; + int no_devices; int force; char *homehost; int require_homehost; @@ -622,7 +668,6 @@ enum sysfs_read_flags { GET_MISMATCH = (1 << 5), GET_VERSION = (1 << 6), GET_DISKS = (1 << 7), - GET_DEGRADED = (1 << 8), GET_SAFEMODE = (1 << 9), GET_BITMAP_LOCATION = (1 << 10), @@ -633,14 +678,15 @@ enum sysfs_read_flags { GET_ERROR = (1 << 24), GET_ARRAY_STATE = (1 << 25), GET_CONSISTENCY_POLICY = (1 << 26), + GET_DEVS_ALL = (1 << 27), }; /* If fd >= 0, get the array it is open on, * else use devnm. */ extern int sysfs_open(char *devnm, char *devname, char *attr); -extern void sysfs_init(struct mdinfo *mdi, int fd, char *devnm); -extern void sysfs_init_dev(struct mdinfo *mdi, unsigned long devid); +extern int sysfs_init(struct mdinfo *mdi, int fd, char *devnm); +extern void sysfs_init_dev(struct mdinfo *mdi, dev_t devid); extern void sysfs_free(struct mdinfo *sra); extern struct mdinfo *sysfs_read(int fd, char *devnm, unsigned long options); extern int sysfs_attr_match(const char *attr, const char *str); @@ -673,6 +719,7 @@ extern int sysfs_unique_holder(char *devnm, long rdev); extern int sysfs_freeze_array(struct mdinfo *sra); extern int sysfs_wait(int fd, int *msec); extern int load_sys(char *path, char *buf, int len); +extern int zero_disk_range(int fd, unsigned long long sector, size_t count); extern int reshape_prepare_fdlist(char *devname, struct mdinfo *sra, int raid_disks, @@ -716,7 +763,9 @@ 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[], r6layout[], pers[], modes[], faultylayout[], consistency_policies[]; +extern mapping_t r0layout[], r5layout[], r6layout[], + pers[], modes[], faultylayout[]; +extern mapping_t consistency_policies[], sysfs_array_states[]; extern char *map_dev_preferred(int major, int minor, int create, char *prefer); @@ -799,8 +848,9 @@ extern struct superswitch { /* Used to report details of an active array. * ->load_super was possibly given a 'component' string. */ - void (*detail_super)(struct supertype *st, char *homehost); - void (*brief_detail_super)(struct supertype *st); + void (*detail_super)(struct supertype *st, char *homehost, + char *subarray); + void (*brief_detail_super)(struct supertype *st, char *subarray); void (*export_detail_super)(struct supertype *st); /* Optional: platform hardware / firmware details */ @@ -929,11 +979,14 @@ extern struct superswitch { */ __u64 (*avail_size)(struct supertype *st, __u64 size, unsigned long long data_offset); - /* This is similar to 'avail_size' in purpose, but is used for - * containers for which there is no 'component size' to compare. - * This reports that whole-device size which is a minimum + /* + * Return spare criteria for array: + * - minimum disk size can be used in array; + * - sector size can be used in array. + * Return values: 0 - for success and -EINVAL on error. */ - unsigned long long (*min_acceptable_spare_size)(struct supertype *st); + int (*get_spare_criteria)(struct supertype *st, + struct spare_criteria *sc); /* Find somewhere to put a bitmap - possibly auto-size it - and * update the metadata to record this. The array may be newly * created, in which case data_size may be updated, or it might @@ -985,7 +1038,8 @@ extern struct superswitch { /* query the supertype for default geometry */ void (*default_geometry)(struct supertype *st, int *level, int *layout, int *chunk); /* optional */ /* Permit subarray's to be deleted from inactive containers */ - int (*kill_subarray)(struct supertype *st); /* optional */ + int (*kill_subarray)(struct supertype *st, + char *subarray_id); /* optional */ /* Permit subarray's to be modified */ int (*update_subarray)(struct supertype *st, char *subarray, char *update, struct mddev_ident *ident); /* optional */ @@ -1172,6 +1226,7 @@ extern int get_dev_size(int fd, char *dname, unsigned long long *sizep); extern int get_dev_sector_size(int fd, char *dname, unsigned int *sectsizep); extern int must_be_container(int fd); extern int dev_size_from_id(dev_t id, unsigned long long *size); +extern int dev_sector_size_from_id(dev_t id, unsigned int *size); void wait_for(char *dev, int fd); /* @@ -1227,7 +1282,7 @@ extern void policyline(char *line, char *type); extern void policy_add(char *type, ...); extern void policy_free(void); -extern struct dev_policy *path_policy(char *path, char *type); +extern struct dev_policy *path_policy(char **paths, char *type); extern struct dev_policy *disk_policy(struct mdinfo *disk); extern struct dev_policy *devid_policy(int devid); extern void dev_policy_free(struct dev_policy *p); @@ -1271,6 +1326,9 @@ void domain_add(struct domainlist **domp, char *domain); extern void policy_save_path(char *id_path, struct map_ent *array); extern int policy_check_path(struct mdinfo *disk, struct map_ent *array); +extern void sysfs_rules_apply(char *devnm, struct mdinfo *dev); +extern void sysfsline(char *line); + #if __GNUC__ < 3 struct stat64; #endif @@ -1375,7 +1433,7 @@ extern int Kill(char *dev, struct supertype *st, int force, int verbose, int noe extern int Kill_subarray(char *dev, char *subarray, int verbose); extern int Update_subarray(char *dev, char *subarray, char *update, struct mddev_ident *ident, int quiet); extern int Wait(char *dev); -extern int WaitClean(char *dev, int sock, int verbose); +extern int WaitClean(char *dev, int verbose); extern int SetAction(char *dev, char *action); extern int Incremental(struct mddev_dev *devlist, struct context *c, @@ -1404,7 +1462,9 @@ extern int Dump_metadata(char *dev, char *dir, struct context *c, extern int Restore_metadata(char *dev, char *dir, struct context *c, struct supertype *st, int only); -extern int md_get_version(int fd); +int md_array_valid(int fd); +int md_array_active(int fd); +int md_array_is_active(struct mdinfo *info); int md_get_array_info(int fd, struct mdu_array_info_s *array); int md_set_array_info(int fd, struct mdu_array_info_s *array); int md_get_disk_info(int fd, struct mdu_disk_info_s *disk); @@ -1412,6 +1472,7 @@ extern int get_linux_version(void); extern int mdadm_version(char *version); extern unsigned long long parse_size(char *size); extern int parse_uuid(char *str, int uuid[4]); +extern int is_near_layout_10(int layout); extern int parse_layout_10(char *layout); extern int parse_layout_faulty(char *layout); extern long parse_num(char *num); @@ -1422,6 +1483,8 @@ extern int check_raid(int fd, char *name); extern int check_partitions(int fd, char *dname, unsigned long long freesize, unsigned long long size); +extern int fstat_is_blkdev(int fd, char *devname, dev_t *rdev); +extern int stat_is_blkdev(char *devname, dev_t *rdev); extern int get_mdp_major(void); extern int get_maj_min(char *dev, int *major, int *minor); @@ -1460,7 +1523,6 @@ extern struct mddev_ident *conf_match(struct supertype *st, struct mdinfo *info, char *devname, int verbose, int *rvp); -extern int experimental(void); extern void free_line(char *line); extern int match_oneof(char *devices, char *devname); @@ -1474,7 +1536,6 @@ extern char *fname_from_uuid(struct supertype *st, extern unsigned long calc_csum(void *super, int bytes); extern int enough(int level, int raid_disks, int layout, int clean, char *avail); -extern int enough_fd(int fd); extern int ask(char *mesg); extern unsigned long long get_component_size(int fd); extern void remove_partitions(int fd); @@ -1494,7 +1555,7 @@ extern int assemble_container_content(struct supertype *st, int mdfd, #define INCR_ALREADY 4 #define INCR_YES 8 extern struct mdinfo *container_choose_spares(struct supertype *st, - unsigned long long min_size, + struct spare_criteria *criteria, struct domainlist *domlist, char *spare_group, const char *metadata, int get_one); @@ -1515,7 +1576,7 @@ extern void print_r10_layout(int layout); extern char *find_free_devnm(int use_partitions); extern void put_md_name(char *name); -extern char *devid2kname(int devid); +extern char *devid2kname(dev_t devid); extern char *devid2devnm(dev_t devid); extern dev_t devnm2devid(char *devnm); extern char *get_md_name(char *devnm); @@ -1523,7 +1584,7 @@ extern char *get_md_name(char *devnm); extern char DefaultConfFile[]; extern int create_mddev(char *dev, char *name, int autof, int trustworthy, - char *chosen); + char *chosen, int block_udev); /* values for 'trustworthy' */ #define LOCAL 1 #define LOCAL_ANY 10 @@ -1557,6 +1618,8 @@ extern char *stat2kname(struct stat *st); extern char *fd2kname(int fd); extern char *stat2devnm(struct stat *st); extern char *fd2devnm(int fd); +extern void udev_block(char *devnm); +extern void udev_unblock(void); extern int in_initrd(void); @@ -1578,6 +1641,7 @@ struct dlm_hooks { dlm_lshandle_t (*create_lockspace)(const char *name, unsigned int mode); + dlm_lshandle_t (*open_lockspace)(const char *name); int (*release_lockspace)(const char *name, dlm_lshandle_t ls, int force); int (*ls_lock)(dlm_lshandle_t lockspace, uint32_t mode, @@ -1586,17 +1650,16 @@ struct dlm_hooks { uint32_t parent, void (*astaddr) (void *astarg), void *astarg, void (*bastaddr) (void *astarg), void *range); - int (*ls_unlock)(dlm_lshandle_t lockspace, uint32_t lkid, - uint32_t flags, struct dlm_lksb *lksb, - void *astarg); + int (*ls_unlock_wait)(dlm_lshandle_t lockspace, uint32_t lkid, + uint32_t flags, struct dlm_lksb *lksb); int (*ls_get_fd)(dlm_lshandle_t ls); int (*dispatch)(int fd); }; extern int get_cluster_name(char **name); extern int dlm_funs_ready(void); -extern int cluster_get_dlmlock(int *lockid); -extern int cluster_release_dlmlock(int lockid); +extern int cluster_get_dlmlock(void); +extern int cluster_release_dlmlock(void); extern void set_dlm_hooks(void); #define _ROUND_UP(val, base) (((val) + (base) - 1) & ~(base - 1)) @@ -1697,6 +1760,11 @@ char *xstrdup(const char *str); #define makedev(M,m) (((M)<<8) | (m)) #endif +enum r0layout { + RAID0_ORIG_LAYOUT = 1, + RAID0_ALT_MULTIZONE_LAYOUT = 2, +}; + /* for raid4/5/6 */ #define ALGORITHM_LEFT_ASYMMETRIC 0 #define ALGORITHM_RIGHT_ASYMMETRIC 1 @@ -1747,7 +1815,8 @@ char *xstrdup(const char *str); #define RESYNC_NONE -1 #define RESYNC_DELAYED -2 #define RESYNC_PENDING -3 -#define RESYNC_UNKNOWN -4 +#define RESYNC_REMOTE -4 +#define RESYNC_UNKNOWN -5 /* When using "GET_DISK_INFO" it isn't certain how high * we need to check. So we impose an absolute limit of