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

diff --git a/ctdb/common/ctdb_io.c b/ctdb/common/ctdb_io.c
index 806c57f6db212bfa481c59b911b0ddeda52f7bb5..152d535f0e52dd7b3041e9de6836be3e3c471867 100644 (file)
--- a/ctdb/common/ctdb_io.c
+++ b/ctdb/common/ctdb_io.c
@@ -30,11 +30,11 @@
 
 #include "lib/util/dlinklist.h"
 #include "lib/util/debug.h"
+#include "lib/util/sys_rw.h"
 
 #include "ctdb_private.h"
 #include "ctdb_client.h"
 
-#include "common/system.h"
 #include "common/logging.h"
 #include "common/common.h"
 

diff --git a/ctdb/common/system.h b/ctdb/common/system.h
index 2007814ce3b8dc37eb650884453b7ce5bbbdf1ff..2875760806a3a2f6be56023a08b7c378fc2920c7 100644 (file)
--- a/ctdb/common/system.h
+++ b/ctdb/common/system.h
@@ -60,9 +60,6 @@ void lockdown_memory(bool valgrinding);
 int mkdir_p(const char *dir, int mode);
 void mkdir_p_or_die(const char *dir, int mode);
 
-ssize_t sys_read(int fd, void *buf, size_t count);
-ssize_t sys_write(int fd, const void *buf, size_t count);
-
 void ctdb_wait_for_process_to_exit(pid_t pid);
 
 int ctdb_parse_connections(FILE *fp, TALLOC_CTX *mem_ctx,

diff --git a/ctdb/common/system_util.c b/ctdb/common/system_util.c
index 9e897c21c4bf100675bf3ea113ba5b581f4c959d..57452aa6a1a81854125c42e6527cc961e99efdcd 100644 (file)
--- a/ctdb/common/system_util.c
+++ b/ctdb/common/system_util.c
@@ -349,40 +349,6 @@ void mkdir_p_or_die(const char *dir, int mode)
        }
 }
 
-/* A read wrapper that will deal with EINTR.  For now, copied from
- * source3/lib/system.c
- */
-ssize_t sys_read(int fd, void *buf, size_t count)
-{
-        ssize_t ret;
-
-        do {
-                ret = read(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;
-}
-
-/* A write wrapper that will deal with EINTR.  For now, copied from
- * source3/lib/system.c
- */
-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;
-}
-
 void ctdb_wait_for_process_to_exit(pid_t pid)
 {
        while (kill(pid, 0) == 0 || errno != ESRCH) {

diff --git a/ctdb/server/ctdb_call.c b/ctdb/server/ctdb_call.c
index 3478419fd4c0f2abbf352afa418f583cc7dd6fc1..670491132ab2485a6340ad8ec291635aa5cfbbf8 100644 (file)
--- 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 34484913ce1bc94019f3c2ba336eba31ca115d37..93977463e0c399272fba4b2d18bf96a9e2dd28d4 100644 (file)
--- 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 7b6e8434695f76921214268c360412cd26fbee69..5e48b9ccfdaa7a97eb9f793dbb1ee6fc64a0a785 100644 (file)
--- 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 3a58711bc4b3d576dbb4ac8b9f13660efc3a2630..139ead02eac23f74d4f0be0a10173008182c63ba 100644 (file)
--- 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 9ac7c0cea1319672ce28ca5ce1fe45c031c0efc3..d7f8fe146f7c51f04395eb69bfc0c6dc7e4bb324 100644 (file)
--- 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 fbafe9be3405d752f2f17a3c727b22c8dc3f52eb..87dbd3be8ea7cb00f020001db4757daa43464e87 100644 (file)
--- 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 488de263a8011781e501af6a1c4def7d2c442d1e..fc6720b942e426bba60a7d05e200e738d6c611de 100644 (file)
--- 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 87358beb234d12db997bb44e421b673c98ced808..7b66c78cd8eff2f4f79d65e9da4d2f486ad8a2e8 100644 (file)
--- 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 68618333ad79a396fd45f2bc982f3447a5af7534..c310102ed863d4a67cc401ce8f2d54bdd3cf4546 100644 (file)
--- 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 7dfb707b458f0260ecd43692f61f3169a1226b34..09bc9897893b186a1fd4a771794e21ab2687907e 100644 (file)
--- 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 f71c5fbab550334913eb88cee116262a3f5ecffe..c2ae1df21bf6a2586da7478d17f516baa8d98cf3 100644 (file)
--- 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 11a5385ba91355008acadbdb649214a47c27ed38..1f9504224adad517d657c25bd69c30496c5956a1 100644 (file)
--- 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 56f3b837a4b25f0c6d050f5cad03dfd1526eec74..63d1b5c1212e50073f145aa587ac728943b15232 100644 (file)
--- 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 174ccb233099c1f0a121c965db88fcd097523f94..5ffab1deb80a424b2a97a525433f31aefd66a30e 100644 (file)
--- 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 86d37d901e2ee2b2fac018b2ef674909d8023b9e..8f6ffd188296a2a16622b31d00796b48ee5d6bca 100644 (file)
--- 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"
 

diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
index a1024ae33b5bc11b5762e51652024d57cff60f78..59719757df94f048c4b6eb2ebf3e8612eb041c9a 100644 (file)
--- a/ctdb/tools/ctdb.c
+++ b/ctdb/tools/ctdb.c
@@ -32,6 +32,7 @@
 #include "ctdb_version.h"
 #include "lib/util/debug.h"
 #include "lib/util/samba_util.h"
+#include "lib/util/sys_rw.h"
 
 #include "common/db_hash.h"
 #include "common/logging.h"

diff --git a/ctdb/wscript b/ctdb/wscript
index a69e57b2a82ed5cb2884a5f6e143badfec15b511..f4bccefd6a3a2ee92011efd010422354bc7e3307 100644 (file)
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -412,7 +412,8 @@ def build(bld):
                                              ctdb_update_record.c
                                              ctdb_lock.c ctdb_fork.c'''),
                         includes='include',
-                        deps='ctdb-ipalloc replace popt talloc tevent tdb talloc_report')
+                        deps='''ctdb-ipalloc replace sys_rw
+                                popt talloc tevent tdb talloc_report''')
 
     bld.SAMBA_BINARY('ctdbd',
                      source='',
@@ -425,7 +426,7 @@ def build(bld):
     bld.SAMBA_BINARY('ctdb',
                      source='tools/ctdb.c',
                      deps='''ctdb-client2 ctdb-protocol ctdb-util ctdb-system
-                             samba-util popt''',
+                             samba-util sys_rw popt''',
                      install_path='${BINDIR}',
                      manpages='ctdb.1')
 
@@ -444,25 +445,25 @@ def build(bld):
 
     bld.SAMBA_BINARY('ctdb_lock_helper',
                      source='server/ctdb_lock_helper.c',
-                     deps='samba-util ctdb-system talloc tdb',
+                     deps='samba-util sys_rw ctdb-system talloc tdb',
                      includes='include',
                      install_path='${CTDB_HELPER_BINDIR}')
 
     bld.SAMBA_BINARY('ctdb_event_helper',
                      source='server/ctdb_event_helper.c',
                      includes='include',
-                     deps='samba-util ctdb-system replace tdb',
+                     deps='samba-util sys_rw ctdb-system replace tdb',
                      install_path='${CTDB_HELPER_BINDIR}')
 
     bld.SAMBA_BINARY('ctdb_recovery_helper',
                      source='server/ctdb_recovery_helper.c',
                      deps='''ctdb-client2 ctdb-protocol ctdb-util
-                             samba-util replace tdb''',
+                             samba-util sys_rw replace tdb''',
                      install_path='${CTDB_HELPER_BINDIR}')
 
     bld.SAMBA_BINARY('ctdb_mutex_fcntl_helper',
                      source='server/ctdb_mutex_fcntl_helper.c',
-                     deps='ctdb-system',
+                     deps='sys_rw ctdb-system',
                      includes='include',
                      install_path='${CTDB_HELPER_BINDIR}')
 
@@ -739,7 +740,7 @@ def build(bld):
         bld.SAMBA_BINARY('ibwrapper_test',
                          source='ib/ibwrapper_test.c',
                          includes='include',
-                         deps='replace talloc ctdb-client ctdb-common' +
+                         deps='replace talloc ctdb-client ctdb-common sys_rw' +
                               ib_deps,
                          install_path='${CTDB_TEST_LIBEXECDIR}')