From f0503527548a13cd1af2db640488b4c01857fc4d Mon Sep 17 00:00:00 2001 From: shishir gowda Date: Fri, 15 Nov 2013 14:53:44 +0530 Subject: snapshot: Merge conflict resolution Signed-off-by: shishir gowda --- libglusterfs/src/glusterfs.h | 1 + libglusterfs/src/mem-types.h | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'libglusterfs') diff --git a/libglusterfs/src/glusterfs.h b/libglusterfs/src/glusterfs.h index a2fd48db5..98f512522 100644 --- a/libglusterfs/src/glusterfs.h +++ b/libglusterfs/src/glusterfs.h @@ -460,6 +460,7 @@ typedef enum { GF_EVENT_AUTH_FAILED, GF_EVENT_VOLUME_DEFRAG, GF_EVENT_PARENT_DOWN, + GF_EVENT_VOLUME_BARRIER_OP, GF_EVENT_MAXVAL, } glusterfs_event_t; diff --git a/libglusterfs/src/mem-types.h b/libglusterfs/src/mem-types.h index 9aadbcaec..f5dc6f29f 100644 --- a/libglusterfs/src/mem-types.h +++ b/libglusterfs/src/mem-types.h @@ -117,6 +117,9 @@ enum gf_common_mem_types_ { gf_common_mt_locker = 101, gf_common_mt_auxgids = 102, gf_common_mt_syncopctx = 103, - gf_common_mt_end = 104 + gf_common_mt_uuid_t = 104, + gf_common_mt_vol_lock_obj_t = 105, + gf_common_mt_txn_opinfo_obj_t = 106, + gf_common_mt_end = 107 }; #endif -- cgit