mgmt/glusterd: misc fixes in replace-brick and get volumes

Signed-off-by: Vijay Bellur <vijay@gluster.com>
Signed-off-by: Vijay Bellur <vijay@dev.gluster.com>

BUG: 971 (dynamic volume management)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=971

1 files changed, 7 insertions, 7 deletions

diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c
index 5a3aafe8e..b1f075167 100644
--- a/xlators/mgmt/glusterd/src/glusterd-handler.c
+++ b/xlators/mgmt/glusterd/src/glusterd-handler.c
@@ -2859,13 +2859,13 @@ glusterd_get_volumes (rpcsvc_request_t *req, dict_t *dict, int32_t flags)
         priv = THIS->private;
         GF_ASSERT (priv);
 
-        if (!list_empty (&priv->volumes)) {
-                volumes = dict_new ();
-                if (!volumes) {
-                        gf_log ("", GF_LOG_WARNING, "Out of Memory");
-                        goto out;
-                }
-        } else {
+        volumes = dict_new ();
+        if (!volumes) {
+                gf_log ("", GF_LOG_WARNING, "Out of Memory");
+                goto out;
+        }
+
+        if (list_empty (&priv->volumes)) {
                 ret = 0;
                 goto respond;
         }