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

Incremental: Close unclosed mdfd in IncrementalScan() 

In addition to closing mdfd, propagate helpers to manage file
descriptors across IncrementalScan().

Signed-off-by: Mateusz Grzonka <mateusz.grzonka@intel.com>
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
This commit is contained in:
Mateusz Grzonka 2021-11-24 11:45:30 +01:00 committed by Jes Sorensen
parent 195d1d7658
commit b2e4f08414
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Incremental.c
View File

@ -1346,7 +1346,7 @@ restart:
} }
mdfd = open_dev(me->devnm); mdfd = open_dev(me->devnm);
if (mdfd < 0) if (!is_fd_valid(mdfd))
continue; continue;
if (!isdigit(me->metadata[0])) { if (!isdigit(me->metadata[0])) {
/* must be a container */ /* must be a container */
@ -1356,7 +1356,7 @@ restart:
if (st && st->ss->load_container) if (st && st->ss->load_container)
ret = st->ss->load_container(st, mdfd, NULL); ret = st->ss->load_container(st, mdfd, NULL);
close(mdfd); close_fd(&mdfd);
if (!ret && st && st->ss->container_content) { if (!ret && st && st->ss->container_content) {
if (map_lock(&map)) if (map_lock(&map))
pr_err("failed to get exclusive lock on mapfile\n"); pr_err("failed to get exclusive lock on mapfile\n");
@ -1368,7 +1368,7 @@ restart:
continue; continue;
} }
if (md_array_active(mdfd)) { if (md_array_active(mdfd)) {
close(mdfd); close_fd(&mdfd);
continue; continue;
} }
/* Ok, we can try this one. Maybe it needs a bitmap */ /* Ok, we can try this one. Maybe it needs a bitmap */
@ -1385,9 +1385,9 @@ restart:
int bmfd; int bmfd;
bmfd = open(mddev->bitmap_file, O_RDWR); bmfd = open(mddev->bitmap_file, O_RDWR);
if (bmfd >= 0) { if (is_fd_valid(bmfd)) {
added = ioctl(mdfd, SET_BITMAP_FILE, bmfd); added = ioctl(mdfd, SET_BITMAP_FILE, bmfd);
close(bmfd); close_fd(&bmfd);
} }
if (c->verbose >= 0) { if (c->verbose >= 0) {
if (added == 0) if (added == 0)
@ -1416,6 +1416,7 @@ restart:
} }
sysfs_free(sra); sysfs_free(sra);
} }
close_fd(&mdfd);
} }
map_free(mapl); map_free(mapl);
return rv; return rv;