diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 43f24e938df..b91348d72ee 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -2580,9 +2580,6 @@ int BlueStore::fiemap(
   map<uint64_t,bluestore_extent_t>::iterator bp, bend;
   map<uint64_t,bluestore_overlay_t>::iterator op, oend;
 
-  if (offset == len && offset == 0)
-    len = o->onode.size;
-
   if (offset > o->onode.size)
     goto out;
 
diff --git a/src/os/kstore/KStore.cc b/src/os/kstore/KStore.cc
index 96978e29be2..37e838e27a5 100644
--- a/src/os/kstore/KStore.cc
+++ b/src/os/kstore/KStore.cc
@@ -1605,9 +1605,6 @@ int KStore::fiemap(
     return -ENOENT;
   }
 
-  if (offset == len && offset == 0)
-    len = o->onode.size;
-
   if (offset > o->onode.size)
     goto out;
 
diff --git a/src/os/memstore/MemStore.cc b/src/os/memstore/MemStore.cc
index 29a8be5f29e..6873f5e44fd 100644
--- a/src/os/memstore/MemStore.cc
+++ b/src/os/memstore/MemStore.cc
@@ -329,8 +329,6 @@ int MemStore::fiemap(coll_t cid, const ghobject_t& oid,
     return -ENOENT;
   map<uint64_t, uint64_t> m;
   size_t l = len;
-  if (offset == 0 && len == 0)
-    l = o->get_size();
   if (offset + l > o->get_size())
     l = o->get_size() - offset;
   if (offset >= o->get_size())
diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc
index d57e82c221d..10302167f6d 100644
--- a/src/test/objectstore/store_test.cc
+++ b/src/test/objectstore/store_test.cc
@@ -267,7 +267,7 @@ TEST_P(StoreTest, FiemapHoles) {
   }
   {
     bufferlist bl;
-    store->fiemap(cid, oid, 0, 0, bl);
+    store->fiemap(cid, oid, 0, 4194307, bl);
     map<uint64_t,uint64_t> m, e;
     bufferlist::iterator p = bl.begin();
     ::decode(m, p);