Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

util: md_array_valid(): Introduce md_array_valid() helper 

Using md_get_array_info() to determine if an array is valid is broken
during creation, since the ioctl() returns -ENODEV if the device is
valid but not active.

Where did I leave my stash of brown paper bags?

Fixes: ("40b054e mdopen/open_mddev: Use md_get_array_info() to determine valid array")
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
This commit is contained in:
Jes Sorensen 2017-05-03 14:25:57 -04:00
parent 99148c19bd
commit 9db2ab4e9b
3 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mdadm.h
View File

@ -1415,6 +1415,7 @@ 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);
int md_array_valid(int fd);
int md_array_active(int fd);
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);

3
mdopen.c
View File

@ -442,7 +442,6 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy,
*/
int open_mddev(char *dev, int report_errors)
{
struct mdu_array_info_s array;
int mdfd = open(dev, O_RDONLY);
if (mdfd < 0) {
@ -452,7 +451,7 @@ int open_mddev(char *dev, int report_errors)
return -1;
}
if (md_get_array_info(mdfd, &array) != 0) {
if (md_array_valid(mdfd) == 0) {
close(mdfd);
if (report_errors)
pr_err("%s does not appear to be an md device\n", dev);

24
util.c
View File

@ -200,6 +200,30 @@ out:
return ret;
}
int md_array_valid(int fd)
{
struct mdinfo *sra;
int ret;
sra = sysfs_read(fd, NULL, GET_ARRAY_STATE);
if (sra) {
if (sra->array_state != ARRAY_UNKNOWN_STATE)
ret = 0;
else
ret = -ENODEV;
free(sra);
} else {
/*
* GET_ARRAY_INFO doesn't provide access to the proper state
* information, so fallback to a basic check for raid_disks != 0
*/
ret = ioctl(fd, RAID_VERSION);
}
return !ret;
}
int md_array_active(int fd)
{
struct mdinfo *sra;