Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[karo-tx-linux.git] / fs / ceph / inode.c

diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index 4bc086a72475e514a1db0c89357174073ee2c615..851814d951cd57c42b64b113c1055c31c8640106 100644 (file)
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -612,10 +612,11 @@ 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);
+                    from_kuid(&init_user_ns, inode->i_uid),
+                    from_kgid(&init_user_ns, inode->i_gid));
        }
 
        if ((issued & CEPH_CAP_LINK_EXCL) == 0)
@@ -1601,26 +1602,30 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr)
 
        if (ia_valid & ATTR_UID) {
                dout("setattr %p uid %d -> %d\n", inode,
-                    inode->i_uid, attr->ia_uid);
+                    from_kuid(&init_user_ns, inode->i_uid),
+                    from_kuid(&init_user_ns, attr->ia_uid));
                if (issued & CEPH_CAP_AUTH_EXCL) {
                        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;
                }
        }
        if (ia_valid & ATTR_GID) {
                dout("setattr %p gid %d -> %d\n", inode,
-                    inode->i_gid, attr->ia_gid);
+                    from_kgid(&init_user_ns, inode->i_gid),
+                    from_kgid(&init_user_ns, attr->ia_gid));
                if (issued & CEPH_CAP_AUTH_EXCL) {
                        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;
                }