git.samba.org
/
ambi
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
531e672
)
ctdb-recovery: Don't bother ensuring file descriptor is -1
author
Martin Schwenke
<martin@meltin.net>
Mon, 11 Jan 2016 03:50:14 +0000
(14:50 +1100)
committer
Amitay Isaacs
<amitay@samba.org>
Tue, 23 Feb 2016 06:23:18 +0000
(07:23 +0100)
This is already done before the destructor is assigned.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
ctdb/server/ctdb_recover.c
patch
|
blob
|
history
diff --git
a/ctdb/server/ctdb_recover.c
b/ctdb/server/ctdb_recover.c
index 4e6171ab1b38ff5cdbec9a36d94487b24294a8fb..9719f38146f944c0e2e410df80f4803ab18dab83 100644
(file)
--- a/
ctdb/server/ctdb_recover.c
+++ b/
ctdb/server/ctdb_recover.c
@@
-451,9
+451,6
@@
static int set_recmode_destructor(struct ctdb_set_recmode_state *state)
if (state->fd[0] != -1) {
state->fd[0] = -1;
}
- if (state->fd[1] != -1) {
- state->fd[1] = -1;
- }
ctdb_kill(state->ctdb, state->child, SIGKILL);
return 0;
}