From 4bc104f0d91a858956159f6c1eff8943c3d605f3 Mon Sep 17 00:00:00 2001 From: Prasanna Kumar Kalever Date: Mon, 20 Feb 2017 12:51:22 +0530 Subject: gluster-blockd: fix bug in glusterBlockCleanUp fix filename in GB_METAUPDATE_OR_GOTO() i.e change gbid to blockname Signed-off-by: Prasanna Kumar Kalever --- rpc/block_svc_routines.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rpc/block_svc_routines.c b/rpc/block_svc_routines.c index 1da5c18..403ec9e 100644 --- a/rpc/block_svc_routines.c +++ b/rpc/block_svc_routines.c @@ -509,17 +509,17 @@ glusterBlockCleanUp(struct glfs *glfs, char *blockname, } if (cleanupsuccess == info->nhosts) { - GB_METAUPDATE_OR_GOTO(lock, glfs, info->gbid, info->volume, + GB_METAUPDATE_OR_GOTO(lock, glfs, blockname, info->volume, ret, out, "ENTRYDELETE: INPROGRESS\n"); if (glusterBlockDeleteEntry(glfs, info->volume, info->gbid)) { - GB_METAUPDATE_OR_GOTO(lock, glfs, info->gbid, info->volume, + GB_METAUPDATE_OR_GOTO(lock, glfs, blockname, info->volume, ret, out, "ENTRYDELETE: FAIL\n"); LOG("mgmt", GB_LOG_ERROR, "%s %s for block %s", FAILED_DELETING_FILE, info->volume, blockname); ret = -1; goto out; } - GB_METAUPDATE_OR_GOTO(lock, glfs, info->gbid, info->volume, + GB_METAUPDATE_OR_GOTO(lock, glfs, blockname, info->volume, ret, out, "ENTRYDELETE: SUCCESS\n"); ret = glusterBlockDeleteMetaFile(glfs, info->volume, blockname); if (ret) { -- cgit