From 6350f623853acf82d7d09a89c79a4ab5d6655fff Mon Sep 17 00:00:00 2001 From: Rajesh Joseph Date: Wed, 15 Jan 2014 14:33:22 +0530 Subject: Snapshot: Minor change to fix last merge conflict Some changes were missed in resolving conflict in the restore patch. Change-Id: Ie0cf01237bf975027056c10bb3681e122334f83e Signed-off-by: Rajesh Joseph --- xlators/mgmt/glusterd/src/glusterd-store.c | 1 - xlators/mgmt/glusterd/src/glusterd-store.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'xlators') diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c index 41633ebd8..06979c2c3 100644 --- a/xlators/mgmt/glusterd/src/glusterd-store.c +++ b/xlators/mgmt/glusterd/src/glusterd-store.c @@ -2700,7 +2700,6 @@ glusterd_store_update_volinfo (glusterd_volinfo_t *volinfo, { int ret = -1; int exists = 0; - uint64_t count = 0; char *key = NULL; char *value = NULL; char volpath[PATH_MAX] = {0,}; diff --git a/xlators/mgmt/glusterd/src/glusterd-store.h b/xlators/mgmt/glusterd/src/glusterd-store.h index d9192e396..b8123f644 100644 --- a/xlators/mgmt/glusterd/src/glusterd-store.h +++ b/xlators/mgmt/glusterd/src/glusterd-store.h @@ -64,6 +64,7 @@ typedef enum glusterd_store_ver_ac_{ #define GLUSTERD_STORE_KEY_SNAP_NAME "name" #define GLUSTERD_STORE_KEY_SNAP_ID "snap-id" #define GLUSTERD_STORE_KEY_SNAP_CG_ID "cg-id" +#define GLUSTERD_STORE_KEY_SNAP_CG_NAME "cg-name" #define GLUSTERD_STORE_KEY_SNAP_DESC "desc" #define GLUSTERD_STORE_KEY_SNAP_TIMESTAMP "time-stamp" #define GLUSTERD_STORE_KEY_SNAP_STATUS "status" -- cgit