diff options
Diffstat (limited to 'xlators/cluster/nsr-server/src')
| -rw-r--r-- | xlators/cluster/nsr-server/src/Makefile.am | 2 | ||||
| -rw-r--r-- | xlators/cluster/nsr-server/src/all-templates.c | 2 | ||||
| -rw-r--r-- | xlators/cluster/nsr-server/src/nsr.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/xlators/cluster/nsr-server/src/Makefile.am b/xlators/cluster/nsr-server/src/Makefile.am index 85a560d09..7153352ad 100644 --- a/xlators/cluster/nsr-server/src/Makefile.am +++ b/xlators/cluster/nsr-server/src/Makefile.am @@ -25,7 +25,7 @@ noinst_HEADERS = nsr-internal.h etcd-api.h all-templates.c \ AM_CPPFLAGS = $(GF_CPPFLAGS) \ -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/xlators/lib/src \ - -I$(top_srcdir)/rpc/rpc-lib/src + -I$(top_srcdir)/rpc/rpc-lib/src -DSBIN_DIR=\"$(sbindir)\" AM_CFLAGS = -Wall $(GF_CFLAGS) diff --git a/xlators/cluster/nsr-server/src/all-templates.c b/xlators/cluster/nsr-server/src/all-templates.c index 3403aed8c..2f0509a6c 100644 --- a/xlators/cluster/nsr-server/src/all-templates.c +++ b/xlators/cluster/nsr-server/src/all-templates.c @@ -92,7 +92,7 @@ nsr_$NAME$ (call_frame_t *frame, xlator_t *this, } - if (!priv->leader || priv->fence_io) { + if (!priv->leader/* || priv->fence_io*/) { op_errno = EREMOTE; goto err; } diff --git a/xlators/cluster/nsr-server/src/nsr.c b/xlators/cluster/nsr-server/src/nsr.c index 75412a8f5..9f2338148 100644 --- a/xlators/cluster/nsr-server/src/nsr.c +++ b/xlators/cluster/nsr-server/src/nsr.c @@ -664,7 +664,7 @@ nsr_init (xlator_t *this) if (!stat(priv->vol_file, &buf)) { runinit (&runner); - runner_add_args(&runner, "/usr/local/sbin/glusterfs", + runner_add_args(&runner, SBIN_DIR "/glusterfs", "-f", recon_file, "-p", recon_pid_file, "-l", recon_log, |