diff options
| author | Pavan Sondur <pavan@gluster.com> | 2010-08-26 07:55:38 +0000 |
|---|---|---|
| committer | Anand V. Avati <avati@dev.gluster.com> | 2010-08-26 07:31:29 -0700 |
| commit | ee3f7b941f889619d0688372f93e31f7e6a7cf3b (patch) | |
| tree | 2c5cc6b8cb1f7c570744d538b74966d3fed249db /xlators/mgmt/glusterd/src/glusterd-utils.c | |
| parent | 2d935ef9c8cba1dae93e8e7dc0238aa46358edc3 (diff) | |
mgmt/glusterd: Use a C based volgen and support various xlator options.
Signed-off-by: Pavan Vilas Sondur <pavan@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>
BUG: 1429 (Use a C based volgen)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1429
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-utils.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index e8d9b4634c2..a6f9082a801 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -40,6 +40,7 @@ #include "glusterd-sm.h" #include "glusterd-utils.h" #include "glusterd-store.h" +#include "glusterd-volgen.h" #include <sys/resource.h> #include <inttypes.h> @@ -480,6 +481,14 @@ glusterd_volinfo_new (glusterd_volinfo_t **volinfo) INIT_LIST_HEAD (&new_volinfo->vol_list); INIT_LIST_HEAD (&new_volinfo->bricks); + ret = glusterd_default_xlator_options (new_volinfo); + if (ret) { + if (new_volinfo) + GF_FREE (new_volinfo); + + goto out; + } + *volinfo = new_volinfo; ret = 0; @@ -523,6 +532,8 @@ glusterd_volinfo_delete (glusterd_volinfo_t *volinfo) goto out; } + dict_unref (volinfo->dict); + GF_FREE (volinfo); ret = 0; @@ -632,7 +643,6 @@ out: return ret; } - int32_t glusterd_brickinfo_get (char *brick, glusterd_volinfo_t *volinfo, glusterd_brickinfo_t **brickinfo) |