LU-4476 kernel: support process namespace containers

[fs/lustre-release.git] / lustre / llite / namei.c

diff --git a/lustre/llite/namei.c b/lustre/llite/namei.c
index 9149182..b47df73 100644 (file)
--- a/lustre/llite/namei.c
+++ b/lustre/llite/namei.c
@@ -350,9 +350,9 @@ int ll_md_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
 __u32 ll_i2suppgid(struct inode *i)
 {
        if (in_group_p(i->i_gid))
-               return (__u32)i->i_gid;
+               return (__u32)from_kgid(&init_user_ns, i->i_gid);
        else
-               return (__u32)(-1);
+               return (__u32) __kgid_val(INVALID_GID);
 }
 
 /* Pack the required supplementary groups into the supplied groups array.
@@ -361,35 +361,15 @@ __u32 ll_i2suppgid(struct inode *i)
  * array in case it might be useful.  Not needed if doing an MDS-side upcall. */
 void ll_i2gids(__u32 *suppgids, struct inode *i1, struct inode *i2)
 {
-#if 0
-        int i;
-#endif
-
-        LASSERT(i1 != NULL);
-        LASSERT(suppgids != NULL);
-
-        suppgids[0] = ll_i2suppgid(i1);
+       LASSERT(i1 != NULL);
+       LASSERT(suppgids != NULL);
 
-        if (i2)
-                suppgids[1] = ll_i2suppgid(i2);
-                else
-                        suppgids[1] = -1;
+       suppgids[0] = ll_i2suppgid(i1);
 
-#if 0
-        for (i = 0; i < current_ngroups; i++) {
-                if (suppgids[0] == -1) {
-                        if (current_groups[i] != suppgids[1])
-                                suppgids[0] = current_groups[i];
-                        continue;
-                }
-                if (suppgids[1] == -1) {
-                        if (current_groups[i] != suppgids[0])
-                                suppgids[1] = current_groups[i];
-                        continue;
-                }
-                break;
-        }
-#endif
+       if (i2)
+               suppgids[1] = ll_i2suppgid(i2);
+       else
+               suppgids[1] = -1;
 }
 
 /*
@@ -948,7 +928,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)