Commit a04aff25 authored by Christian Brauner's avatar Christian Brauner Committed by Ilya Dryomov
Browse files

ceph: allow idmapped setattr inode op 



Enable __ceph_setattr() to handle idmapped mounts. This is just a matter
of passing down the mount's idmapping.

[ aleksandr.mikhalitsyn: adapted to b27c82e1 ("attr: port attribute
  changes to new types") ]

Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
Signed-off-by: default avatarAlexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Reviewed-by: default avatarXiubo Li <xiubli@redhat.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 79c66a0c

fs/ceph/inode.c

+12 −8
Original line number Diff line number Diff line
@@ -2544,33 +2544,37 @@ int __ceph_setattr(struct mnt_idmap *idmap, struct inode *inode, 
#endif /* CONFIG_FS_ENCRYPTION */



	if (ia_valid & ATTR_UID) {

		kuid_t fsuid = from_vfsuid(idmap, i_user_ns(inode), attr->ia_vfsuid);



		doutc(cl, "%p %llx.%llx uid %d -> %d\n", inode,

		      ceph_vinop(inode),

		      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;

			inode->i_uid = fsuid;

			dirtied |= CEPH_CAP_AUTH_EXCL;

		} else if ((issued & CEPH_CAP_AUTH_SHARED) == 0 ||

			   !uid_eq(attr->ia_uid, inode->i_uid)) {

			   !uid_eq(fsuid, inode->i_uid)) {

			req->r_args.setattr.uid = cpu_to_le32(

				from_kuid(&init_user_ns, attr->ia_uid));

				from_kuid(&init_user_ns, fsuid));

			mask |= CEPH_SETATTR_UID;

			release |= CEPH_CAP_AUTH_SHARED;

		}

	}

	if (ia_valid & ATTR_GID) {

		kgid_t fsgid = from_vfsgid(idmap, i_user_ns(inode), attr->ia_vfsgid);



		doutc(cl, "%p %llx.%llx gid %d -> %d\n", inode,

		      ceph_vinop(inode),

		      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;

			inode->i_gid = fsgid;

			dirtied |= CEPH_CAP_AUTH_EXCL;

		} else if ((issued & CEPH_CAP_AUTH_SHARED) == 0 ||

			   !gid_eq(attr->ia_gid, inode->i_gid)) {

			   !gid_eq(fsgid, inode->i_gid)) {

			req->r_args.setattr.gid = cpu_to_le32(

				from_kgid(&init_user_ns, attr->ia_gid));

				from_kgid(&init_user_ns, fsgid));

			mask |= CEPH_SETATTR_GID;

			release |= CEPH_CAP_AUTH_SHARED;

		}
@@ -2799,7 +2803,7 @@ int ceph_setattr(struct mnt_idmap *idmap, struct dentry *dentry, 
	if (err)

		return err;



	err = setattr_prepare(&nop_mnt_idmap, dentry, attr);

	err = setattr_prepare(idmap, dentry, attr);

	if (err != 0)

		return err;
@@ -2814,7 +2818,7 @@ int ceph_setattr(struct mnt_idmap *idmap, struct dentry *dentry, 
	err = __ceph_setattr(idmap, inode, attr, NULL);



	if (err >= 0 && (attr->ia_valid & ATTR_MODE))

		err = posix_acl_chmod(&nop_mnt_idmap, dentry, attr->ia_mode);

		err = posix_acl_chmod(idmap, dentry, attr->ia_mode);



	return err;

}