RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-05 07:48:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'unstable' of ceph.newdream.net:git/ceph into unstable

Browse Source
This commit is contained in:
Sage Weil 2010-05-12 16:13:36 -07:00
commit 4ee1e26125
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/ceph_fs.h
View File

@ -100,7 +100,7 @@ int ceph_file_layout_is_valid(const struct ceph_file_layout *layout);
#define CEPH_AUTH_NONE 0x1
#define CEPH_AUTH_CEPHX 0x2
#define CEPH_AUTH_UID_DEFAULT (__u64) -1
#define CEPH_AUTH_UID_DEFAULT ((__u64) -1)
/*********************************************

3
src/include/ceph_strings.cc
View File

@ -175,7 +175,8 @@ const char *ceph_snap_op_name(int o)
return "???";
}
const char *ceph_pool_op_name(int op) {
const char *ceph_pool_op_name(int op)
{
switch (op) {
case POOL_OP_CREATE:
return "create pool";

3
src/osd/ReplicatedPG.cc
View File

@ -950,7 +950,6 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops,
// modify?
bool is_modify;
string cname, mname;
dout(0) << "osd_op.data.length=" << osd_op.data.length() << dendl;
bufferlist::iterator bp = osd_op.data.begin();
switch (op.op) {
case CEPH_OSD_OP_CALL:
@ -1106,6 +1105,7 @@ dout(0) << "osd_op.data.length=" << osd_op.data.length() << dendl;
string aname;
bp.copy(op.xattr.name_len, aname);
string name = "_" + aname;
name[op.xattr.name_len + 1] = 0;
bufferlist xattr;
result = osd->store->getattr(coll_t::build_pg_coll(info.pgid), soid, name.c_str(), xattr);
@ -1117,6 +1117,7 @@ dout(0) << "osd_op.data.length=" << osd_op.data.length() << dendl;
{
string val;
bp.copy(op.xattr.value_len, val);
val[op.xattr.value_len] = 0;
dout(10) << "CEPH_OSD_OP_CMPXATTR name=" << name << " val=" << val
<< " op=" << (int)op.xattr.cmp_op << " mode=" << (int)op.xattr.cmp_mode << dendl;
result = do_xattr_cmp_str(op.xattr.cmp_op, val, xattr);