c8h4/btrfs-progs
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

btrfs-progs: fix close of error fd in scrub cancel

Browse source 
If we retry opening the mountpoint and fail, we'll call
close on a filehandle w/ value -1.  Rearrange so the
retry uses the same open and same error handling.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
This commit is contained in:
Eric Sandeen 2013-02-25 16:54:40 -06:00 committed by David Sterba
parent 67c631329a
commit 5eaeb577b5
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cmds-scrub.c
View file

@ -1448,13 +1448,13 @@ static int cmd_scrub_cancel(int argc, char **argv)
path = argv[1];
again:
fdmnt = open_file_or_dir(path);
if (fdmnt < 0) {
fprintf(stderr, "ERROR: scrub cancel failed\n");
return 12;
return 1;
}
again:
ret = ioctl(fdmnt, BTRFS_IOC_SCRUB_CANCEL, NULL);
err = errno;
@ -1463,15 +1463,12 @@ again:
ret = check_mounted_where(fdmnt, path, mp, sizeof(mp),
&fs_devices_mnt);
if (ret) {
/* It is a device; open the mountpoint. */
/* It is a device; try again with the mountpoint. */
close(fdmnt);
fdmnt = open_file_or_dir(mp);
if (fdmnt >= 0) {
path = mp;
goto again;
}
}
}
close(fdmnt);