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 <jdurgin@redhat.com>

diff --git a/src/librbd/ImageCtx.cc b/src/librbd/ImageCtx.cc
index e76b1aa5d425bca704c793e407ead58fdf3b2036..39d7ea86d828ca0cacf73e0f56d52e2a070ec8ef 100644 (file)
--- 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