ctdb-common: Drop CTDB's copy of sys_read() and sys_write()

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
Autobuild-Date(master): Tue Nov 29 11:22:40 CET 2016 on sn-devel-144

15 files changed, 17 insertions, 21 deletions

diff --git a/ctdb/server/ctdb_call.c b/ctdb/server/ctdb_call.c
index 3478419fd4c..670491132ab 100644
--- a/ctdb/server/ctdb_call.c
+++ b/ctdb/server/ctdb_call.c
@@ -30,6 +30,7 @@
 #include "lib/util/dlinklist.h"
 #include "lib/util/debug.h"
 #include "lib/util/samba_util.h"
+#include "lib/util/sys_rw.h"
 #include "lib/util/util_process.h"
 
 #include "ctdb_private.h"
diff --git a/ctdb/server/ctdb_cluster_mutex.c b/ctdb/server/ctdb_cluster_mutex.c
index 34484913ce1..93977463e0c 100644
--- a/ctdb/server/ctdb_cluster_mutex.c
+++ b/ctdb/server/ctdb_cluster_mutex.c
@@ -28,12 +28,12 @@
 #include "lib/util/time.h"
 #include "lib/util/strv.h"
 #include "lib/util/strv_util.h"
+#include "lib/util/sys_rw.h"
 #include "lib/util/blocking.h"
 
 #include "ctdb_private.h"
 #include "common/common.h"
 #include "common/logging.h"
-#include "common/system.h"
 
 #include "ctdb_cluster_mutex.h"
 
diff --git a/ctdb/server/ctdb_event_helper.c b/ctdb/server/ctdb_event_helper.c
index 7b6e8434695..5e48b9ccfda 100644
--- a/ctdb/server/ctdb_event_helper.c
+++ b/ctdb/server/ctdb_event_helper.c
@@ -25,6 +25,7 @@
 #include <talloc.h>
 
 #include "lib/util/blocking.h"
+#include "lib/util/sys_rw.h"
 
 #include "ctdb_private.h"
 
diff --git a/ctdb/server/ctdb_lock.c b/ctdb/server/ctdb_lock.c
index 3a58711bc4b..139ead02eac 100644
--- a/ctdb/server/ctdb_lock.c
+++ b/ctdb/server/ctdb_lock.c
@@ -28,10 +28,10 @@
 #include "lib/util/dlinklist.h"
 #include "lib/util/debug.h"
 #include "lib/util/samba_util.h"
+#include "lib/util/sys_rw.h"
 
 #include "ctdb_private.h"
 
-#include "common/system.h"
 #include "common/common.h"
 #include "common/logging.h"
 
diff --git a/ctdb/server/ctdb_lock_helper.c b/ctdb/server/ctdb_lock_helper.c
index 9ac7c0cea13..d7f8fe146f7 100644
--- a/ctdb/server/ctdb_lock_helper.c
+++ b/ctdb/server/ctdb_lock_helper.c
@@ -24,6 +24,8 @@
 #include <talloc.h>
 #include <tdb.h>
 
+#include "lib/util/sys_rw.h"
+
 #include "protocol/protocol.h"
 
 #include "common/system.h"
diff --git a/ctdb/server/ctdb_logging.c b/ctdb/server/ctdb_logging.c
index fbafe9be340..87dbd3be8ea 100644
--- a/ctdb/server/ctdb_logging.c
+++ b/ctdb/server/ctdb_logging.c
@@ -29,12 +29,12 @@
 #include "lib/util/dlinklist.h"
 #include "lib/util/debug.h"
 #include "lib/util/blocking.h"
+#include "lib/util/sys_rw.h"
 #include "lib/util/time.h"
 
 #include "ctdb_private.h"
 #include "ctdb_client.h"
 
-#include "common/system.h"
 #include "common/common.h"
 #include "common/logging.h"
 
diff --git a/ctdb/server/ctdb_logging_file.c b/ctdb/server/ctdb_logging_file.c
index 488de263a80..fc6720b942e 100644
--- a/ctdb/server/ctdb_logging_file.c
+++ b/ctdb/server/ctdb_logging_file.c
@@ -25,13 +25,12 @@
 #include <talloc.h>
 
 #include "lib/util/debug.h"
+#include "lib/util/sys_rw.h"
 #include "lib/util/time_basic.h"
 
 #include "ctdb_private.h"
 #include "ctdb_client.h"
 
-#include "common/system.h"
-
 #define CTDB_LOG_FILE_PREFIX "file"
 
 struct file_state {
diff --git a/ctdb/server/ctdb_mutex_fcntl_helper.c b/ctdb/server/ctdb_mutex_fcntl_helper.c
index 87358beb234..7b66c78cd8e 100644
--- a/ctdb/server/ctdb_mutex_fcntl_helper.c
+++ b/ctdb/server/ctdb_mutex_fcntl_helper.c
@@ -21,6 +21,8 @@
 #include "system/filesys.h"
 #include "system/network.h"
 
+#include "lib/util/sys_rw.h"
+
 /* protocol.h is just needed for ctdb_sock_addr, which is used in system.h */
 #include "protocol/protocol.h"
 #include "common/system.h"
diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c
index 68618333ad7..c310102ed86 100644
--- a/ctdb/server/ctdb_recoverd.c
+++ b/ctdb/server/ctdb_recoverd.c
@@ -32,6 +32,7 @@
 #include "lib/util/dlinklist.h"
 #include "lib/util/debug.h"
 #include "lib/util/samba_util.h"
+#include "lib/util/sys_rw.h"
 #include "lib/util/util_process.h"
 
 #include "ctdb_private.h"
diff --git a/ctdb/server/ctdb_recovery_helper.c b/ctdb/server/ctdb_recovery_helper.c
index 7dfb707b458..09bc9897893 100644
--- a/ctdb/server/ctdb_recovery_helper.c
+++ b/ctdb/server/ctdb_recovery_helper.c
@@ -27,6 +27,7 @@
 #include <libgen.h>
 
 #include "lib/tdb_wrap/tdb_wrap.h"
+#include "lib/util/sys_rw.h"
 #include "lib/util/time.h"
 #include "lib/util/tevent_unix.h"
 
@@ -55,20 +56,6 @@ static void LOG(const char *fmt, ...)
  * Utility functions
  */
 
-static ssize_t sys_write(int fd, const void *buf, size_t count)
-{
-        ssize_t ret;
-
-        do {
-                ret = write(fd, buf, count);
-#if defined(EWOULDBLOCK)
-        } while (ret == -1 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));
-#else
-        } while (ret == -1 && (errno == EINTR || errno == EAGAIN));
-#endif
-        return ret;
-}
-
 static bool generic_recv(struct tevent_req *req, int *perr)
 {
 	int err;
diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c
index f71c5fbab55..c2ae1df21bf 100644
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -30,6 +30,7 @@
 #include "lib/util/dlinklist.h"
 #include "lib/util/debug.h"
 #include "lib/util/samba_util.h"
+#include "lib/util/sys_rw.h"
 #include "lib/util/util_process.h"
 
 #include "ctdb_private.h"
diff --git a/ctdb/server/ctdb_traverse.c b/ctdb/server/ctdb_traverse.c
index 11a5385ba91..1f9504224ad 100644
--- a/ctdb/server/ctdb_traverse.c
+++ b/ctdb/server/ctdb_traverse.c
@@ -30,6 +30,7 @@
 #include "lib/util/dlinklist.h"
 #include "lib/util/debug.h"
 #include "lib/util/samba_util.h"
+#include "lib/util/sys_rw.h"
 #include "lib/util/util_process.h"
 
 #include "ctdb_private.h"
diff --git a/ctdb/server/ctdb_update_record.c b/ctdb/server/ctdb_update_record.c
index 56f3b837a4b..63d1b5c1212 100644
--- a/ctdb/server/ctdb_update_record.c
+++ b/ctdb/server/ctdb_update_record.c
@@ -28,6 +28,7 @@
 #include "lib/tdb_wrap/tdb_wrap.h"
 #include "lib/util/debug.h"
 #include "lib/util/samba_util.h"
+#include "lib/util/sys_rw.h"
 #include "lib/util/util_process.h"
 
 #include "ctdb_private.h"
diff --git a/ctdb/server/ctdb_vacuum.c b/ctdb/server/ctdb_vacuum.c
index 174ccb23309..5ffab1deb80 100644
--- a/ctdb/server/ctdb_vacuum.c
+++ b/ctdb/server/ctdb_vacuum.c
@@ -31,13 +31,13 @@
 #include "lib/util/dlinklist.h"
 #include "lib/util/debug.h"
 #include "lib/util/samba_util.h"
+#include "lib/util/sys_rw.h"
 #include "lib/util/util_process.h"
 
 #include "ctdb_private.h"
 #include "ctdb_client.h"
 
 #include "common/rb_tree.h"
-#include "common/system.h"
 #include "common/common.h"
 #include "common/logging.h"
 
diff --git a/ctdb/server/eventscript.c b/ctdb/server/eventscript.c
index 86d37d901e2..8f6ffd18829 100644
--- a/ctdb/server/eventscript.c
+++ b/ctdb/server/eventscript.c
@@ -31,11 +31,11 @@
 #include "lib/util/dlinklist.h"
 #include "lib/util/debug.h"
 #include "lib/util/samba_util.h"
+#include "lib/util/sys_rw.h"
 
 #include "ctdb_private.h"
 
 #include "common/rb_tree.h"
-#include "common/system.h"
 #include "common/common.h"
 #include "common/logging.h"