diff options
| author | Sage Weil <sage@inktank.com> | 2013-10-07 05:22:20 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-10-07 05:22:41 -0700 |
| commit | 32e6ae9255ca3369be58d0d45bfff76f208eddc9 (patch) | |
| tree | 9f42880eb10ea3611f9962048cad66947556b20e | |
| parent | 21119e7ed1bfd5db82610283304081ba410b597d (diff) | |
| download | ceph-wip-osd-fixes.tar.gz | |
os/FileStore: fix ENOENT error code for getattrs()wip-osd-fixes
In commit dc0dfb9e01d593afdd430ca776cf4da2c2240a20 the omap xattrs code
moved up a block and r was no longer local to the block. Translate
ENOENT -> 0 to compensate.
Fix the same error in _rmattrs().
Signed-off-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/os/FileStore.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc index 514ff022bee..3506c4a4ccd 100644 --- a/src/os/FileStore.cc +++ b/src/os/FileStore.cc @@ -3464,6 +3464,8 @@ int FileStore::getattrs(coll_t cid, const ghobject_t& oid, map<string,bufferptr> dout(10) << __func__ << " could not get omap_attrs r = " << r << dendl; goto out; } + if (r == -ENOENT) + r = 0; assert(omap_attrs.size() == omap_aset.size()); for (map<string, bufferlist>::iterator i = omap_aset.begin(); i != omap_aset.end(); @@ -3651,6 +3653,8 @@ int FileStore::_rmattrs(coll_t cid, const ghobject_t& oid, dout(10) << __func__ << " could not remove omap_attrs r = " << r << dendl; return r; } + if (r == -ENOENT) + r = 0; out: dout(10) << "rmattrs " << cid << "/" << oid << " = " << r << dendl; return r; |