projects
/
platform
/
upstream
/
btrfs-progs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a70837a
)
btrfs-progs: don't double-close prg_fd
author
Eric Sandeen
<sandeen@redhat.com>
Fri, 25 Jan 2013 00:18:49 +0000
(18:18 -0600)
committer
Zach Brown
<zab@redhat.com>
Wed, 6 Feb 2013 00:09:41 +0000
(16:09 -0800)
If scrub start discovers that scrub is already running,
we need to set prg_fd to -1 before goto out, or we'll
try to close it again in the error path.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Zach Brown <zab@redhat.com>
cmds-scrub.c
patch
|
blob
|
history
diff --git
a/cmds-scrub.c
b/cmds-scrub.c
index 8655d3d98501f9111473abbdb84fe82799860d02..31ace6d40c65de9c48489361bcca4dcd91e6817f 100644
(file)
--- a/
cmds-scrub.c
+++ b/
cmds-scrub.c
@@
-1192,6
+1192,7
@@
static int scrub_start(int argc, char **argv, int resume)
/* ... yes, so scrub must be running. error out */
fprintf(stderr, "ERROR: scrub already running\n");
close(prg_fd);
+ prg_fd = -1;
goto out;
}
/*