diff options
| author | NeilBrown <neilb@suse.de> | 2008-10-30 13:59:11 +1100 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2008-10-30 13:59:11 +1100 |
| commit | 6c766cf10178b9bae4ddcfd6b8de2d70f9d84568 (patch) | |
| tree | 7287af68b8f177d25beab071932bf7b6984c1462 /util.c | |
| parent | 71d60c480ac37a20b0b7a896a818a5f0c9c55f1a (diff) | |
| parent | 7b403fef7e97c16e1eb63773a278eb65c6dfd9a8 (diff) | |
| download | mdadm-6c766cf10178b9bae4ddcfd6b8de2d70f9d84568.tar.gz mdadm-6c766cf10178b9bae4ddcfd6b8de2d70f9d84568.tar.xz mdadm-6c766cf10178b9bae4ddcfd6b8de2d70f9d84568.zip | |
Merge branch 'master' into devel-3.0
Conflicts:
Incremental.c
super0.c
super1.c
Diffstat (limited to 'util.c')
| -rw-r--r-- | util.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -432,7 +432,7 @@ int is_standard(char *dev, int *nump) if (strncmp(d, "/d",2)==0) d += 2, type=1; /* /dev/md/dN{pM} */ else if (strncmp(d, "/md_d", 5)==0) - d += 5, type=1; /* /dev/md_dNpM */ + d += 5, type=1; /* /dev/md_dN{pM} */ else if (strncmp(d, "/md", 3)==0) d += 3, type=-1; /* /dev/mdN */ else if (d-dev > 3 && strncmp(d-2, "md/", 3)==0) |