diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2015-10-01 16:31:19 -0400 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2015-10-28 13:38:42 -0700 |
| commit | 3066a21caafab6305527991de11c8eb43ec0044c (patch) | |
| tree | 5efc91272ac76ff1613cee1e8a41aeb32aa92d73 /glusterfsd/src/glusterfsd-mgmt.c | |
| parent | 063d4ead61ee47433793de81a1c77e0ba69e6e07 (diff) | |
core: use syscall wrappers instead of direct syscalls - miscellaneous
various xlators and other components are invoking system calls
directly instead of using the libglusterfs/syscall.[ch] wrappers.
If not using the system call wrappers there should be a comment
in the source explaining why the wrapper isn't used.
Change-Id: I1f47820534c890a00b452fa61f7438eb2b3f667c
BUG: 1267967
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/12276
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Diffstat (limited to 'glusterfsd/src/glusterfsd-mgmt.c')
| -rw-r--r-- | glusterfsd/src/glusterfsd-mgmt.c | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c index 81c18ffc715..749873872d2 100644 --- a/glusterfsd/src/glusterfsd-mgmt.c +++ b/glusterfsd/src/glusterfsd-mgmt.c @@ -31,6 +31,7 @@ #include "statedump.h" #include "syncop.h" #include "xlator.h" +#include "syscall.h" static gf_boolean_t is_mgmt_rpc_reconnect = _gf_false; int need_emancipate = 0; @@ -399,12 +400,12 @@ glusterfs_volume_top_write_perf (uint32_t blk_size, uint32_t blk_count, gettimeofday (&begin, NULL); for (iter = 0; iter < blk_count; iter++) { - ret = read (input_fd, buf, blk_size); + ret = sys_read (input_fd, buf, blk_size); if (ret != blk_size) { ret = -1; goto out; } - ret = write (fd, buf, blk_size); + ret = sys_write (fd, buf, blk_size); if (ret != blk_size) { ret = -1; goto out; @@ -427,11 +428,11 @@ glusterfs_volume_top_write_perf (uint32_t blk_size, uint32_t blk_count, out: if (fd >= 0) - close (fd); + sys_close (fd); if (input_fd >= 0) - close (input_fd); + sys_close (input_fd); GF_FREE (buf); - unlink (export_path); + sys_unlink (export_path); return ret; } @@ -488,24 +489,24 @@ glusterfs_volume_top_read_perf (uint32_t blk_size, uint32_t blk_count, } for (iter = 0; iter < blk_count; iter++) { - ret = read (input_fd, buf, blk_size); + ret = sys_read (input_fd, buf, blk_size); if (ret != blk_size) { ret = -1; goto out; } - ret = write (fd, buf, blk_size); + ret = sys_write (fd, buf, blk_size); if (ret != blk_size) { ret = -1; goto out; } } - ret = fsync (fd); + ret = sys_fsync (fd); if (ret) { gf_log ("glusterd", GF_LOG_ERROR, "could not flush cache"); goto out; } - ret = lseek (fd, 0L, 0); + ret = sys_lseek (fd, 0L, 0); if (ret != 0) { gf_log ("glusterd", GF_LOG_ERROR, "could not seek back to start"); @@ -514,12 +515,12 @@ glusterfs_volume_top_read_perf (uint32_t blk_size, uint32_t blk_count, } gettimeofday (&begin, NULL); for (iter = 0; iter < blk_count; iter++) { - ret = read (fd, buf, blk_size); + ret = sys_read (fd, buf, blk_size); if (ret != blk_size) { ret = -1; goto out; } - ret = write (output_fd, buf, blk_size); + ret = sys_write (output_fd, buf, blk_size); if (ret != blk_size) { ret = -1; goto out; @@ -542,13 +543,13 @@ glusterfs_volume_top_read_perf (uint32_t blk_size, uint32_t blk_count, out: if (fd >= 0) - close (fd); + sys_close (fd); if (input_fd >= 0) - close (input_fd); + sys_close (input_fd); if (output_fd >= 0) - close (output_fd); + sys_close (output_fd); GF_FREE (buf); - unlink (export_path); + sys_unlink (export_path); return ret; } @@ -1973,7 +1974,7 @@ glusterfs_listener_stop (glusterfs_ctx_t *ctx) cmd_args = &ctx->cmd_args; if (cmd_args->sock_file) { - ret = unlink (cmd_args->sock_file); + ret = sys_unlink (cmd_args->sock_file); if (ret && (ENOENT == errno)) { ret = 0; } |