summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmmanuel Dreyfus <manu@netbsd.org>2013-11-17 02:03:03 +0100
committerVijay Bellur <vbellur@redhat.com>2013-11-18 01:36:45 -0800
commitf9443a3f148dde4bb1a628184140d59f45db64a2 (patch)
tree9ab15b3e2b07ed25bd51b03d2cf6220387a6a4e6
parenteb412da2375e6bbae5cc7a39db9e60fbbdd7aaa0 (diff)
Have #include <signal.h> for kill(2)
BUG: 764655 Change-Id: I4d18c9a6c00cb4696645fcb437398562f00b9d24 Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org> Reviewed-on: http://review.gluster.org/6284 Reviewed-by: Vijay Bellur <vbellur@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat
-rw-r--r--xlators/cluster/dht/src/dht-common.h1
-rw-r--r--xlators/cluster/dht/src/dht-rebalance.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/xlators/cluster/dht/src/dht-common.h b/xlators/cluster/dht/src/dht-common.h
index 7564c600bc4..9e4bde1a5f1 100644
--- a/xlators/cluster/dht/src/dht-common.h
+++ b/xlators/cluster/dht/src/dht-common.h
@@ -14,6 +14,7 @@
#endif
#include <regex.h>
+#include <signal.h>
#include "dht-mem-types.h"
#include "libxlator.h"
diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c
index bcb19f23e96..99d92459c12 100644
--- a/xlators/cluster/dht/src/dht-rebalance.c
+++ b/xlators/cluster/dht/src/dht-rebalance.c
@@ -16,6 +16,7 @@
#include "dht-common.h"
#include "xlator.h"
+#include <signal.h>
#include <fnmatch.h>
#define GF_DISK_SECTOR_SIZE 512
generated by cgit (git 2.34.1) at 2025-12-28 20:43:56 +0000
loc_t new_loc = {0, };
struct timeval tv = {0, };
+ uint32_t len = 0;
+ char buf[PATH_MAX];
if (!init_ctx || (!init_ctx->specfile && !init_ctx->specfp)) {
errno = EINVAL;
@@ -1148,6 +1154,43 @@ glusterfs_init (glusterfs_init_params_t *init_ctx, uint32_t fakefsid)
if (first_init)
{
+ memset (buf, 0, PATH_MAX);
+
+ if (getcwd (buf, PATH_MAX) == NULL) {
+ fprintf (stderr, "libglusterfsclient: cannot get "
+ "current working directory (%s)",
+ strerror (errno));
+ FREE (ctx->gf_ctx.cmd_args.log_file);
+ FREE (ctx->gf_ctx.pool);
+ FREE (ctx->gf_ctx.event_pool);
+ FREE (ctx);
+ return NULL;
+ }
+
+ len = strlen (buf);
+ if ((buf[len - 1] != '/')) {
+ if ((len + 2) > PATH_MAX) {
+ errno = ENAMETOOLONG;
+ fprintf (stderr, "libglusterfsclient: cannot"
+ "get current working directory (%s)",
+ strerror (errno));
+ FREE (ctx->gf_ctx.cmd_args.log_file);
+ FREE (ctx->gf_ctx.pool);
+ FREE (ctx->gf_ctx.event_pool);
+ FREE (ctx);
+ return NULL;
+ }
+
+ strcat (buf, "/");
+ }
+
+ pthread_mutex_lock (&cwdlock);
+ {
+ strcpy (cwd, buf);
+ cwd_inited = 1;
+ }
+ pthread_mutex_unlock (&cwdlock);
+
ret = gf_log_init (ctx->gf_ctx.cmd_args.log_file);
if (ret == -1) {
fprintf (stderr,
@@ -7601,6 +7644,80 @@ out:
}
+int
+libgf_client_chdir (const char *path)
+{
+ int op_ret = 0;
+ uint32_t resulting_cwd_len = 0;
+
+ pthread_mutex_lock (&cwdlock);
+ {
+ if (!libgf_path_absolute (path)) {
+ resulting_cwd_len = strlen (path) + strlen (cwd)
+ + ((path[strlen (path) - 1] == '/')
+ ? 0 : 1) + 1;
+
+ if (resulting_cwd_len > PATH_MAX) {
+ op_ret = -1;
+ errno = ENAMETOOLONG;
+ goto unlock;
+ }
+ strcat (cwd, path);
+ } else {
+ resulting_cwd_len = strlen (path)
+ + ((path[strlen (path) - 1] == '/')
+ ? 0 : 1) + 1;
+
+ if (resulting_cwd_len > PATH_MAX) {
+ op_ret = -1;
+ errno = ENAMETOOLONG;
+ goto unlock;
+ }
+
+ strcpy (cwd, path);
+ }
+
+ if (cwd[strlen (cwd) - 1] != '/') {
+ strcat (cwd, "/");
+ }
+ }
+unlock:
+ pthread_mutex_unlock (&cwdlock);
+
+ return op_ret;
+}
+
+
+int
+glusterfs_chdir (const char *path)
+{
+ int32_t op_ret = -1;
+ glusterfs_handle_t handle = NULL;
+ loc_t loc = {0, };
+ char vpath[PATH_MAX];
+
+ handle = libgf_resolved_path_handle (path, vpath);
+
+ if (handle != NULL) {
+ loc.path = strdup (vpath);
+ if (!loc.path) {
+ gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "Path compaction "
+ "failed");
+ goto out;
+ }
+
+ op_ret = libgf_client_path_lookup (&loc, handle, 0);
+ }
+
+ if ((handle == NULL) || (op_ret == 0)) {
+ libgf_client_chdir (path);
+ }
+
+out:
+ return op_ret;
+}
+
+
static struct xlator_fops libgf_client_fops = {
};
diff --git a/libglusterfsclient/src/libglusterfsclient.h b/libglusterfsclient/src/libglusterfsclient.h
index fbc0206995d..2486dd75450 100755
--- a/libglusterfsclient/src/libglusterfsclient.h
+++ b/libglusterfsclient/src/libglusterfsclient.h
@@ -1305,6 +1305,15 @@ glusterfs_sendfile (int out_fd, glusterfs_file_t in_fd, off_t *offset,
int
glusterfs_fcntl (glusterfs_file_t fd, int cmd, ...);
+/*
+ * Change the current working directory to @path
+ *
+ * @path : path to change the current working directory to.
+ *
+ * Returns 0 on success and -1 on failure with errno set appropriately.
+ */
+int
+glusterfs_chdir (const char *path);
/* FIXME: review the need for these apis */
/* added for log related initialization in booster fork implementation */
generated by cgit (git 2.34.1) at 2025-12-28 20:43:55 +0000