git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a599b96
)
lib: Use poll_intr_one_fd in ctdb_read_packet
author
Volker Lendecke
<vl@samba.org>
Sat, 3 Oct 2015 05:33:12 +0000
(22:33 -0700)
committer
Jeremy Allison
<jra@samba.org>
Wed, 7 Oct 2015 21:54:06 +0000
(23:54 +0200)
This is an actual bug fix if someone sets "ctdb timeout" to something != 0
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/lib/ctdbd_conn.c
patch
|
blob
|
history
diff --git
a/source3/lib/ctdbd_conn.c
b/source3/lib/ctdbd_conn.c
index 990819e089aa9cd36b9c72a166e3b2e378b13297..9e598ac4d0b5e0123d1cb71510d9a5cc1b0c5d21 100644
(file)
--- a/
source3/lib/ctdbd_conn.c
+++ b/
source3/lib/ctdbd_conn.c
@@
-301,7
+301,7
@@
static int ctdb_read_packet(int fd, int timeout, TALLOC_CTX *mem_ctx,
ssize_t nread;
if (timeout != -1) {
- ret = poll_one_fd(fd, POLLIN, timeout, &revents);
+ ret = poll_
intr_
one_fd(fd, POLLIN, timeout, &revents);
if (ret == -1) {
return errno;
}