]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
os/DBObjectMap, FileStore: omap_clear should not remove xattrs
authorSamuel Just <sam.just@inktank.com>
Fri, 10 Jan 2014 21:23:32 +0000 (13:23 -0800)
committerSamuel Just <sam.just@inktank.com>
Fri, 10 Jan 2014 22:02:25 +0000 (14:02 -0800)
commit0c81849c4f1661ce89b8623edaf2873bb6611f62
tree8f8140ef8deeac1b09f87d5946c538dfec0455a0
parenta0e3f05dcb20c6fca9d29d4f5d8405d8d9294b41
os/DBObjectMap, FileStore: omap_clear should not remove xattrs

Prevously, FileStore::_omap_clear() used ObjectMap::clear(), which
incorrectly also blasts any stored xattrs.  Instead, add
ObjectMap::clear_keys_header() to handle this case efficiently.

Fixes: #7065
Fixes: #7135
Signed-off-by: Samuel Just <sam.just@inktank.com>
src/os/DBObjectMap.cc
src/os/DBObjectMap.h
src/os/FileStore.cc
src/os/ObjectMap.h