staging/lustre: fix build when CONFIG_UIDGID_STRICT_TYPE_CHECKS is on

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / staging / lustre / lustre / llite / namei.c

diff --git a/drivers/staging/lustre/lustre/llite/namei.c b/drivers/staging/lustre/lustre/llite/namei.c
index ff8f63d..8e948a7 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/namei.c
+++ b/drivers/staging/lustre/lustre/llite/namei.c
@@ -302,8 +302,8 @@ int ll_md_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
 
 __u32 ll_i2suppgid(struct inode *i)
 {
-       if (current_is_in_group(i->i_gid))
-               return (__u32)i->i_gid;
+       if (in_group_p(i->i_gid))
+               return (__u32)from_kgid(&init_user_ns, i->i_gid);
        else
                return (__u32)(-1);
 }
@@ -805,7 +805,8 @@ static int ll_new_node(struct inode *dir, struct qstr *name,
                GOTO(err_exit, err = PTR_ERR(op_data));
 
        err = md_create(sbi->ll_md_exp, op_data, tgt, tgt_len, mode,
-                       current_fsuid(), current_fsgid(),
+                       from_kuid(&init_user_ns, current_fsuid()),
+                       from_kgid(&init_user_ns, current_fsgid()),
                        cfs_curproc_cap_pack(), rdev, &request);
        ll_finish_md_op_data(op_data);
        if (err)