RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-30 07:23:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2686 from dachary/wip-client-dout

Browse Source 
client: add missing dendl and s/dout/ldout/

Reviewed-by: John Spray <john.spray@redhat.com>
This commit is contained in:
John Spray 2014-10-10 10:05:44 +01:00
commit b2b285938e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/client/Client.cc
View File

@ -5065,21 +5065,21 @@ int Client::_setattr(Inode *in, struct stat *attr, int mask, int uid, int gid,
in->mode = (in->mode & ~07777) | (attr->st_mode & 07777); in->mode = (in->mode & ~07777) | (attr->st_mode & 07777);
mark_caps_dirty(in, CEPH_CAP_AUTH_EXCL); mark_caps_dirty(in, CEPH_CAP_AUTH_EXCL);
mask &= ~CEPH_SETATTR_MODE; mask &= ~CEPH_SETATTR_MODE;
dout(10) << "changing mode to " << attr->st_mode; ldout(cct,10) << "changing mode to " << attr->st_mode << dendl;
} }
if (mask & CEPH_SETATTR_UID) { if (mask & CEPH_SETATTR_UID) {
in->ctime = ceph_clock_now(cct); in->ctime = ceph_clock_now(cct);
in->uid = attr->st_uid; in->uid = attr->st_uid;
mark_caps_dirty(in, CEPH_CAP_AUTH_EXCL); mark_caps_dirty(in, CEPH_CAP_AUTH_EXCL);
mask &= ~CEPH_SETATTR_UID; mask &= ~CEPH_SETATTR_UID;
dout(10) << "changing uid to " << attr->st_uid; ldout(cct,10) << "changing uid to " << attr->st_uid << dendl;
} }
if (mask & CEPH_SETATTR_GID) { if (mask & CEPH_SETATTR_GID) {
in->ctime = ceph_clock_now(cct); in->ctime = ceph_clock_now(cct);
in->gid = attr->st_gid; in->gid = attr->st_gid;
mark_caps_dirty(in, CEPH_CAP_AUTH_EXCL); mark_caps_dirty(in, CEPH_CAP_AUTH_EXCL);
mask &= ~CEPH_SETATTR_GID; mask &= ~CEPH_SETATTR_GID;
dout(10) << "changing gid to " << attr->st_gid; ldout(cct,10) << "changing gid to " << attr->st_gid << dendl;
} }
} }
if (in->caps_issued_mask(CEPH_CAP_FILE_EXCL)) { if (in->caps_issued_mask(CEPH_CAP_FILE_EXCL)) {
@ -5107,17 +5107,17 @@ int Client::_setattr(Inode *in, struct stat *attr, int mask, int uid, int gid,
if (mask & CEPH_SETATTR_MODE) { if (mask & CEPH_SETATTR_MODE) {
req->head.args.setattr.mode = attr->st_mode; req->head.args.setattr.mode = attr->st_mode;
req->inode_drop |= CEPH_CAP_AUTH_SHARED; req->inode_drop |= CEPH_CAP_AUTH_SHARED;
dout(10) << "changing mode to " << attr->st_mode; ldout(cct,10) << "changing mode to " << attr->st_mode << dendl;
} }
if (mask & CEPH_SETATTR_UID) { if (mask & CEPH_SETATTR_UID) {
req->head.args.setattr.uid = attr->st_uid; req->head.args.setattr.uid = attr->st_uid;
req->inode_drop |= CEPH_CAP_AUTH_SHARED; req->inode_drop |= CEPH_CAP_AUTH_SHARED;
dout(10) << "changing uid to " << attr->st_uid; ldout(cct,10) << "changing uid to " << attr->st_uid << dendl;
} }
if (mask & CEPH_SETATTR_GID) { if (mask & CEPH_SETATTR_GID) {
req->head.args.setattr.gid = attr->st_gid; req->head.args.setattr.gid = attr->st_gid;
req->inode_drop |= CEPH_CAP_AUTH_SHARED; req->inode_drop |= CEPH_CAP_AUTH_SHARED;
dout(10) << "changing gid to " << attr->st_gid; ldout(cct,10) << "changing gid to " << attr->st_gid << dendl;
} }
if (mask & CEPH_SETATTR_MTIME) { if (mask & CEPH_SETATTR_MTIME) {
utime_t mtime = utime_t(stat_get_mtime_sec(attr), stat_get_mtime_nsec(attr)); utime_t mtime = utime_t(stat_get_mtime_sec(attr), stat_get_mtime_nsec(attr));