mdadm/bitmap: examine-bitmap failed when bitmap is external mode
--examine-bitmap: the bitmap_file_open() shouldn't omit the
regular file descriptor when the bitmap is external mode.
Such as: ./mdadm -X /mnt/3
This commit is partial revert of commit 0a6bff09d4
(mdadm/util: unify fstat checking blkdev into function)
Signed-off-by: Zhilong Liu <zlliu@suse.com>
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
This commit is contained in:
parent
3b8c712755
commit
8cc56e8b32
12
bitmap.c
12
bitmap.c
|
@ -183,6 +183,7 @@ static int
|
||||||
bitmap_file_open(char *filename, struct supertype **stp, int node_num)
|
bitmap_file_open(char *filename, struct supertype **stp, int node_num)
|
||||||
{
|
{
|
||||||
int fd;
|
int fd;
|
||||||
|
struct stat stb;
|
||||||
struct supertype *st = *stp;
|
struct supertype *st = *stp;
|
||||||
|
|
||||||
fd = open(filename, O_RDONLY|O_DIRECT);
|
fd = open(filename, O_RDONLY|O_DIRECT);
|
||||||
|
@ -192,7 +193,12 @@ bitmap_file_open(char *filename, struct supertype **stp, int node_num)
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (fstat_is_blkdev(fd, filename, NULL)) {
|
if (fstat(fd, &stb) < 0) {
|
||||||
|
pr_err("fstat failed for %s: %s\n", filename, strerror(errno));
|
||||||
|
close(fd);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
if ((stb.st_mode & S_IFMT) == S_IFBLK) {
|
||||||
/* block device, so we are probably after an internal bitmap */
|
/* block device, so we are probably after an internal bitmap */
|
||||||
if (!st)
|
if (!st)
|
||||||
st = guess_super(fd);
|
st = guess_super(fd);
|
||||||
|
@ -211,11 +217,7 @@ bitmap_file_open(char *filename, struct supertype **stp, int node_num)
|
||||||
fd = -1;
|
fd = -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
*stp = st;
|
*stp = st;
|
||||||
} else {
|
|
||||||
close(fd);
|
|
||||||
return -1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return fd;
|
return fd;
|
||||||
|
|
Loading…
Reference in New Issue