diff options
author | Krishnan Parthasarathi <kparthas@redhat.com> | 2013-07-03 13:45:29 +0530 |
---|---|---|
committer | Vijay Bellur <vbellur@redhat.com> | 2013-07-03 21:27:45 -0700 |
commit | f173fb79f9f0bb518226f057c6c71284ae203092 (patch) | |
tree | 0d866ac08a8a68c349a8def3e608264ef955521e /xlators/mgmt/glusterd/src/glusterd.h | |
parent | b6d0be85435f508cf6b343ba5d103e3238f65084 (diff) |
store: move glusterd_store functions from mgmt/glusterd to libglusterfs
Backport of http://review.gluster.org/4676 and
http://review.gluster.org/5243
Making the glusterd_store_* functions re-usable will help with future
changes that need to read/write lists of items.
BUG: 904065
Change-Id: I99fb8eced76d12d5a254567eccff9790b43d8da3
Original-author: Niels de Vos <ndevos@redhat.com>
Signed-off-by: Krishnan Parthasarathi <kparthas@redhat.com>
Reviewed-on: http://review.gluster.org/5279
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd.h')
-rw-r--r-- | xlators/mgmt/glusterd/src/glusterd.h | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd.h b/xlators/mgmt/glusterd/src/glusterd.h index 324336f96b4..8172635cbea 100644 --- a/xlators/mgmt/glusterd/src/glusterd.h +++ b/xlators/mgmt/glusterd/src/glusterd.h @@ -37,6 +37,7 @@ #include "glusterd-pmap.h" #include "cli1-xdr.h" #include "syncop.h" +#include "store.h" #define GLUSTERD_MAX_VOLUME_NAME 1000 #define DEFAULT_LOG_FILE_DIRECTORY DATADIR "/log/glusterfs" @@ -97,13 +98,6 @@ typedef enum glusterd_op_ { } glusterd_op_t; extern const char * gd_op_list[]; -struct glusterd_store_iter_ { - int fd; - FILE *file; - char filepath[PATH_MAX]; -}; - -typedef struct glusterd_store_iter_ glusterd_store_iter_t; struct glusterd_volgen { dict_t *dict; @@ -136,7 +130,7 @@ typedef struct { struct list_head volumes; pthread_mutex_t xprt_lock; struct list_head xprt_list; - glusterd_store_handle_t *handle; + gf_store_handle_t *handle; gf_timer_t *timer; glusterd_sm_tr_log_t op_sm_log; struct rpc_clnt_program *gfs_mgmt; @@ -171,7 +165,7 @@ struct glusterd_brickinfo { int rdma_port; char *logfile; gf_boolean_t signed_in; - glusterd_store_handle_t *shandle; + gf_store_handle_t *shandle; gf_brick_status_t status; struct rpc_clnt *rpc; int decommissioned; @@ -274,9 +268,9 @@ struct glusterd_volinfo_ { int dist_leaf_count; /* Number of bricks in one distribute subvolume */ int port; - glusterd_store_handle_t *shandle; - glusterd_store_handle_t *rb_shandle; - glusterd_store_handle_t *node_state_shandle; + gf_store_handle_t *shandle; + gf_store_handle_t *rb_shandle; + gf_store_handle_t *node_state_shandle; /* Defrag/rebalance related */ glusterd_rebalance_t rebal; |