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 /glusterfsd/src/glusterfsd.h | |
| 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 'glusterfsd/src/glusterfsd.h')
| -rw-r--r-- | glusterfsd/src/glusterfsd.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/glusterfsd/src/glusterfsd.h b/glusterfsd/src/glusterfsd.h index e4f4babaad0..d67d181e174 100644 --- a/glusterfsd/src/glusterfsd.h +++ b/glusterfsd/src/glusterfsd.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2006-2009 Gluster, Inc. <http://www.gluster.com> + Copyright (c) 2006-2010 Gluster, Inc. <http://www.gluster.com> This file is part of GlusterFS. GlusterFS is free software; you can redistribute it and/or modify @@ -25,6 +25,8 @@ #include "config.h" #endif +#include "glusterfsd-common.h" + #define DEFAULT_CLIENT_VOLFILE CONFDIR "/glusterfs.vol" #define DEFAULT_SERVER_VOLFILE CONFDIR "/glusterfsd.vol" #define DEFAULT_LOG_FILE_DIRECTORY DATADIR "/log/glusterfs" @@ -43,16 +45,6 @@ #define ENABLE_NO_DAEMON_MODE 1 #define ENABLE_DEBUG_MODE 1 -#define ZR_XLATOR_READ_ONLY "features/read-only" -#define ZR_XLATOR_MAC_COMPAT "features/mac-compat" -#define ZR_XLATOR_FUSE "mount/fuse" -#define ZR_MOUNTPOINT_OPT "mountpoint" -#define ZR_ATTR_TIMEOUT_OPT "attribute-timeout" -#define ZR_ENTRY_TIMEOUT_OPT "entry-timeout" -#define ZR_DIRECT_IO_OPT "direct-io-mode" -#define ZR_STRICT_VOLFILE_CHECK "strict-volfile-check" -#define ZR_DUMP_FUSE "dump-fuse" - enum argp_option_keys { ARGP_VOLFILE_SERVER_KEY = 's', ARGP_VOLUME_FILE_KEY = 'f', |