ceph: Translate inode uid and gid attributes to/from kuids and kgids.
- In fill_inode() transate uids and gids in the initial user namespace into kuids and kgids stored in inode->i_uid and inode->i_gid. - In ceph_setattr() if they have changed convert inode->i_uid and inode->i_gid into initial user namespace uids and gids for transmission. Cc: Sage Weil <sage@inktank.com> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
This commit is contained in:
parent
05cb11c17e
commit
ab871b903e
|
@ -612,8 +612,8 @@ static int fill_inode(struct inode *inode,
|
|||
|
||||
if ((issued & CEPH_CAP_AUTH_EXCL) == 0) {
|
||||
inode->i_mode = le32_to_cpu(info->mode);
|
||||
inode->i_uid = le32_to_cpu(info->uid);
|
||||
inode->i_gid = le32_to_cpu(info->gid);
|
||||
inode->i_uid = make_kuid(&init_user_ns, le32_to_cpu(info->uid));
|
||||
inode->i_gid = make_kgid(&init_user_ns, le32_to_cpu(info->gid));
|
||||
dout("%p mode 0%o uid.gid %d.%d\n", inode, inode->i_mode,
|
||||
inode->i_uid, inode->i_gid);
|
||||
}
|
||||
|
@ -1570,8 +1570,9 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr)
|
|||
inode->i_uid = attr->ia_uid;
|
||||
dirtied |= CEPH_CAP_AUTH_EXCL;
|
||||
} else if ((issued & CEPH_CAP_AUTH_SHARED) == 0 ||
|
||||
attr->ia_uid != inode->i_uid) {
|
||||
req->r_args.setattr.uid = cpu_to_le32(attr->ia_uid);
|
||||
!uid_eq(attr->ia_uid, inode->i_uid)) {
|
||||
req->r_args.setattr.uid = cpu_to_le32(
|
||||
from_kuid(&init_user_ns, attr->ia_uid));
|
||||
mask |= CEPH_SETATTR_UID;
|
||||
release |= CEPH_CAP_AUTH_SHARED;
|
||||
}
|
||||
|
@ -1583,8 +1584,9 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr)
|
|||
inode->i_gid = attr->ia_gid;
|
||||
dirtied |= CEPH_CAP_AUTH_EXCL;
|
||||
} else if ((issued & CEPH_CAP_AUTH_SHARED) == 0 ||
|
||||
attr->ia_gid != inode->i_gid) {
|
||||
req->r_args.setattr.gid = cpu_to_le32(attr->ia_gid);
|
||||
!gid_eq(attr->ia_gid, inode->i_gid)) {
|
||||
req->r_args.setattr.gid = cpu_to_le32(
|
||||
from_kgid(&init_user_ns, attr->ia_gid));
|
||||
mask |= CEPH_SETATTR_GID;
|
||||
release |= CEPH_CAP_AUTH_SHARED;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue