RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-30 23:13:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1216 from ceph/wip-null-xattr

Browse Source 
mds: remove xattr when null value is given to setxattr()

Reviewed-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2014-02-13 06:59:15 -08:00
commit 39e313fcfa
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/client/Client.cc
View File

@ -7242,6 +7242,9 @@ int Client::_setxattr(Inode *in, const char *name, const void *value,
strncmp(name, "ceph.", 5))
return -EOPNOTSUPP;
if (!value)
flags |= CEPH_XATTR_REMOVE;
MetaRequest *req = new MetaRequest(CEPH_MDS_OP_SETXATTR);
filepath path;
in->make_nosnap_relative_path(path);

5
src/include/ceph_fs.h
View File

@ -354,8 +354,9 @@ extern const char *ceph_mds_op_name(int op);
/*
* Ceph setxattr request flags.
*/
#define CEPH_XATTR_CREATE 1
#define CEPH_XATTR_REPLACE 2
#define CEPH_XATTR_CREATE (1 << 0)
#define CEPH_XATTR_REPLACE (1 << 1)
#define CEPH_XATTR_REMOVE (1 << 31)
union ceph_mds_request_args {
struct {

8
src/mds/Server.cc
View File

@ -3809,9 +3809,11 @@ void Server::handle_client_setxattr(MDRequest *mdr)
pi->ctime = ceph_clock_now(g_ceph_context);
pi->xattr_version++;
px->erase(name);
(*px)[name] = buffer::create(len);
if (len)
req->get_data().copy(0, len, (*px)[name].c_str());
if (!(flags & CEPH_XATTR_REMOVE)) {
(*px)[name] = buffer::create(len);
if (len)
req->get_data().copy(0, len, (*px)[name].c_str());
}
// log + wait
mdr->ls = mdlog->get_current_segment();