staging/lustre: fix build when CONFIG_UIDGID_STRICT_TYPE_CHECKS is on

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / staging / lustre / lustre / obdclass / obdo.c

diff --git a/drivers/staging/lustre/lustre/obdclass/obdo.c b/drivers/staging/lustre/lustre/obdclass/obdo.c
index 01a0e1f..7099764 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/obdo.c
+++ b/drivers/staging/lustre/lustre/obdclass/obdo.c
@@ -100,11 +100,11 @@ void obdo_from_inode(struct obdo *dst, struct inode *src, obd_flag valid)
                newvalid |= OBD_MD_FLMODE;
        }
        if (valid & OBD_MD_FLUID) {
-               dst->o_uid = src->i_uid;
+               dst->o_uid = from_kuid(&init_user_ns, src->i_uid);
                newvalid |= OBD_MD_FLUID;
        }
        if (valid & OBD_MD_FLGID) {
-               dst->o_gid = src->i_gid;
+               dst->o_gid = from_kgid(&init_user_ns, src->i_gid);
                newvalid |= OBD_MD_FLGID;
        }
        if (valid & OBD_MD_FLFLAGS) {
@@ -232,16 +232,16 @@ void obdo_from_iattr(struct obdo *oa, struct iattr *attr, unsigned int ia_valid)
        if (ia_valid & ATTR_MODE) {
                oa->o_mode = attr->ia_mode;
                oa->o_valid |= OBD_MD_FLTYPE | OBD_MD_FLMODE;
-               if (!current_is_in_group(oa->o_gid) &&
+               if (!in_group_p(make_kgid(&init_user_ns, oa->o_gid)) &&
                    !cfs_capable(CFS_CAP_FSETID))
                        oa->o_mode &= ~S_ISGID;
        }
        if (ia_valid & ATTR_UID) {
-               oa->o_uid = attr->ia_uid;
+               oa->o_uid = from_kuid(&init_user_ns, attr->ia_uid);
                oa->o_valid |= OBD_MD_FLUID;
        }
        if (ia_valid & ATTR_GID) {
-               oa->o_gid = attr->ia_gid;
+               oa->o_gid = from_kgid(&init_user_ns, attr->ia_gid);
                oa->o_valid |= OBD_MD_FLGID;
        }
 }
@@ -281,16 +281,16 @@ void iattr_from_obdo(struct iattr *attr, struct obdo *oa, obd_flag valid)
        if (valid & OBD_MD_FLMODE) {
                attr->ia_mode = (attr->ia_mode & S_IFMT)|(oa->o_mode & ~S_IFMT);
                attr->ia_valid |= ATTR_MODE;
-               if (!current_is_in_group(oa->o_gid) &&
+               if (!in_group_p(make_kgid(&init_user_ns, oa->o_gid)) &&
                    !cfs_capable(CFS_CAP_FSETID))
                        attr->ia_mode &= ~S_ISGID;
        }
        if (valid & OBD_MD_FLUID) {
-               attr->ia_uid = oa->o_uid;
+               attr->ia_uid = make_kuid(&init_user_ns, oa->o_uid);
                attr->ia_valid |= ATTR_UID;
        }
        if (valid & OBD_MD_FLGID) {
-               attr->ia_gid = oa->o_gid;
+               attr->ia_gid = make_kgid(&init_user_ns, oa->o_gid);
                attr->ia_valid |= ATTR_GID;
        }
 }