diff options
| author | Vijay Bellur <vijay@gluster.com> | 2011-08-09 05:26:40 -0700 |
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2011-08-09 05:26:40 -0700 |
| commit | 66a8619b08de35b00c37ced3a59e800498afc43c (patch) | |
| tree | 2a11aea6eec4dd1593a3db556fc81780ab7c01d8 | |
| parent | 05e3dcc9b131145b9fb5283af361cf2ad79db8e5 (diff) | |
| parent | 72e1927524ed56c6006c5d48f835e7db95223b00 (diff) | |
Merge branch 'release-3.1' of github.com:gluster/glusterfs into release-3.1
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volgen.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index 61a485202c8..12804e3ad40 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -1423,7 +1423,7 @@ xml_add_volset_element (xmlTextWriterPtr writer, const char *name, goto out; } - ret = xmlTextWriterWriteFormatElement(writer, (xmlChar *)"Description", + ret = xmlTextWriterWriteFormatElement(writer, (xmlChar *)"description", "%s", dscrpt ); if (ret < 0) { gf_log ("glusterd", GF_LOG_ERROR, "Could not create an " @@ -1517,7 +1517,11 @@ glusterd_get_volopt_content (gf_boolean_t xml_out) #if (HAVE_LIB_XML) xmlTextWriterPtr writer = NULL; xmlBufferPtr buf = NULL; +#endif + + INIT_LIST_HEAD (&vol_opt_handle.list); +#if (HAVE_LIB_XML) if (xml_out) { ret = init_sethelp_xml_doc (&writer, &buf); if (ret) /*logging done in init_xml_lib*/ @@ -1533,7 +1537,6 @@ glusterd_get_volopt_content (gf_boolean_t xml_out) goto out; } - INIT_LIST_HEAD (&vol_opt_handle.list); for (vme = &glusterd_volopt_map[0]; vme->key; vme++) { |