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

os/FileStore: use _fgetattrs() from _rmattrs()

Browse Source 
Note that we subtly change failure handling to be more strict: if we
fail to open the file, we error out; before we ignored errors from
_getattr().

Signed-off-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2012-10-27 15:10:56 -07:00
parent cab1d6356d
commit a367e6e99c
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/os/FileStore.cc
View File

@ -4062,16 +4062,24 @@ int FileStore::_rmattrs(coll_t cid, const hobject_t& oid,
dout(15) << "rmattrs " << cid << "/" << oid << dendl;
map<string,bufferptr> aset;
int r = _getattrs(cid, oid, aset);
int r = 0;
int fd = lfn_open(cid, oid, 0);
if (fd < 0) {
r = -errno;
goto out;
}
r = _fgetattrs(fd, aset, false);
if (r >= 0) {
for (map<string,bufferptr>::iterator p = aset.begin(); p != aset.end(); p++) {
char n[CHAIN_XATTR_MAX_NAME_LEN];
get_attrname(p->first.c_str(), n, CHAIN_XATTR_MAX_NAME_LEN);
r = lfn_removexattr(cid, oid, n);
r = chain_fremovexattr(fd, n);
if (r < 0)
break;
}
}
TEMP_FAILURE_RETRY(::close(fd));
if (g_conf->filestore_xattr_use_omap) {
set<string> omap_attrs;
Index index;
@ -4092,6 +4100,7 @@ int FileStore::_rmattrs(coll_t cid, const hobject_t& oid,
return r;
}
}
out:
dout(10) << "rmattrs " << cid << "/" << oid << " = " << r << dendl;
return r;
}