diff options
| author | Csaba Henk <csaba@gluster.com> | 2010-07-08 05:46:50 +0000 |
|---|---|---|
| committer | Anand V. Avati <avati@dev.gluster.com> | 2010-07-08 05:24:57 -0700 |
| commit | c35f6bf8f735eaf35c950d7b7789f6b64ba2c8c0 (patch) | |
| tree | 71591025bfcdfe44e2a8fd7b91068d30893e6267 /xlators/mount | |
| parent | 6779d91ea8ee8bb8f337213b0be2d31e4fd62619 (diff) | |
minor option handling refactorizations
- clean up ZR_* internal option defines
- make argument order of glusterfs_graph_activate() aligned with
other graph ops
Signed-off-by: Csaba Henk <csaba@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>
BUG: 971 (dynamic volume management)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=971
Diffstat (limited to 'xlators/mount')
| -rw-r--r-- | xlators/mount/fuse/src/Makefile.am | 2 | ||||
| -rw-r--r-- | xlators/mount/fuse/src/fuse-bridge.c | 15 |
2 files changed, 7 insertions, 10 deletions
diff --git a/xlators/mount/fuse/src/Makefile.am b/xlators/mount/fuse/src/Makefile.am index 93ee00b81c8..58e33a4e116 100644 --- a/xlators/mount/fuse/src/Makefile.am +++ b/xlators/mount/fuse/src/Makefile.am @@ -17,7 +17,7 @@ fuse_la_LDFLAGS = -module -avoidversion -shared -nostartfiles AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS) -Wall \ -I$(top_srcdir)/libglusterfs/src -I$(CONTRIBDIR)/fuse-include \ - $(GF_CFLAGS) $(GF_FUSE_CFLAGS) + -I$(top_srcdir)/glusterfsd/src $(GF_CFLAGS) $(GF_FUSE_CFLAGS) CLEANFILES = diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c index 4618a37854c..142ff064e55 100644 --- a/xlators/mount/fuse/src/fuse-bridge.c +++ b/xlators/mount/fuse/src/fuse-bridge.c @@ -44,6 +44,7 @@ #include "xlator.h" #include "defaults.h" #include "common-utils.h" +#include "glusterfsd-common.h" #include "statedump.h" #ifdef GF_DARWIN_HOST_OS @@ -63,10 +64,6 @@ /* TODO: when supporting posix acl, remove this definition */ #define DISABLE_POSIX_ACL -#define ZR_MOUNTPOINT_OPT "mountpoint" -#define ZR_DIRECT_IO_OPT "direct-io-mode" -#define ZR_STRICT_VOLFILE_CHECK "strict-volfile-check" - #ifdef GF_LINUX_HOST_OS #define FUSE_OP_HIGH (FUSE_POLL + 1) #endif @@ -3766,19 +3763,19 @@ struct volume_options options[] = { { .key = {"direct-io-mode"}, .type = GF_OPTION_TYPE_BOOL }, - { .key = {"mountpoint", "mount-point"}, + { .key = {ZR_MOUNTPOINT_OPT, "mount-point"}, .type = GF_OPTION_TYPE_PATH }, - { .key = {"dump-fuse", "fuse-dumpfile"}, + { .key = {ZR_DUMP_FUSE, "fuse-dumpfile"}, .type = GF_OPTION_TYPE_PATH }, - { .key = {"attribute-timeout"}, + { .key = {ZR_ATTR_TIMEOUT_OPT}, .type = GF_OPTION_TYPE_DOUBLE }, - { .key = {"entry-timeout"}, + { .key = {ZR_ENTRY_TIMEOUT_OPT}, .type = GF_OPTION_TYPE_DOUBLE }, - { .key = {"strict-volfile-check"}, + { .key = {ZR_STRICT_VOLFILE_CHECK}, .type = GF_OPTION_TYPE_BOOL }, { .key = {NULL} }, |