diff options
| author | Vijay Bellur <vijay@gluster.com> | 2010-07-25 00:38:01 +0000 |
|---|---|---|
| committer | Anand V. Avati <avati@dev.gluster.com> | 2010-07-25 23:29:53 -0700 |
| commit | 931a59e2b9130c6e748f2b7193cd0c2ac5a557bf (patch) | |
| tree | 2d7e8f31c6865176c3d619646dfcaf3c84abd011 /xlators/mgmt/glusterd/src/glusterd.c | |
| parent | ea294f8fd967e8fc6e77558ecf1ab4fd298b7c4f (diff) | |
DVM: bug fixes in cli and glusterd for probe, start volumev3.1.0qa2
Signed-off-by: Vijay Bellur <vijay@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>
BUG: 1187 ()
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1187
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd.c b/xlators/mgmt/glusterd/src/glusterd.c index 7e886f17a6c..cfd07433b15 100644 --- a/xlators/mgmt/glusterd/src/glusterd.c +++ b/xlators/mgmt/glusterd/src/glusterd.c @@ -48,6 +48,7 @@ static uuid_t glusterd_uuid; extern struct rpcsvc_program glusterd1_mop_prog; extern struct rpcsvc_program gluster_handshake_prog; extern struct rpc_clnt_program glusterd3_1_mgmt_prog; +extern glusterd_op_info_t opinfo; static int glusterd_retrieve_uuid () @@ -62,6 +63,16 @@ glusterd_store_uuid () } static int +glusterd_opinfo_init () +{ + int32_t ret = -1; + + ret = pthread_mutex_init (&opinfo.lock, NULL); + + return ret; +} + +static int glusterd_uuid_init () { int ret = -1; @@ -276,6 +287,7 @@ init (xlator_t *this) glusterd_friend_sm_init (); glusterd_op_sm_init (); + glusterd_opinfo_init (); memcpy(conf->uuid, glusterd_uuid, sizeof (uuid_t)); |