RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 02:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7267 from liewegas/wip-fiemap

Browse Source 
osd: drop fiemap len=0 magic

http://pulpito.ceph.com/sage-2016-01-25_07:39:08-rados-wip-sage-testing2---basic-smithi/

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2016-01-25 20:58:37 -05:00
commit b08116b186
4 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/os/bluestore/BlueStore.cc
View File

@ -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;

3
src/os/kstore/KStore.cc
View File

@ -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;

2
src/os/memstore/MemStore.cc
View File

@ -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())

2
src/test/objectstore/store_test.cc
View File

@ -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);