From 27e5ae603b5be34ea02797f7a6a1c9fb220668c0 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Wed, 25 Feb 2015 15:54:00 -0800 Subject: [PATCH] librbd: don't check if object map is enabled before refreshing This check is now done internally by the object map. Signed-off-by: Josh Durgin --- src/librbd/ImageCtx.cc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/librbd/ImageCtx.cc b/src/librbd/ImageCtx.cc index e76b1aa5d425b..39d7ea86d828c 100644 --- a/src/librbd/ImageCtx.cc +++ b/src/librbd/ImageCtx.cc @@ -298,10 +298,8 @@ namespace librbd { snap_exists = true; data_ctx.snap_set_read(snap_id); - if (object_map.enabled()) { - RWLock::WLocker l(object_map_lock); - object_map.refresh(in_snap_id); - } + RWLock::WLocker l(object_map_lock); + object_map.refresh(in_snap_id); return 0; } return -ENOENT; @@ -315,10 +313,8 @@ namespace librbd { snap_exists = true; data_ctx.snap_set_read(snap_id); - if (object_map.enabled()) { - RWLock::WLocker l(object_map_lock); - object_map.refresh(CEPH_NOSNAP); - } + RWLock::WLocker l(object_map_lock); + object_map.refresh(CEPH_NOSNAP); } snap_t ImageCtx::get_snap_id(string in_snap_name) const -- 2.39.5