Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[linux-2.6-block.git] / fs / orangefs / orangefs-cache.c

diff --git a/fs/orangefs/orangefs-cache.c b/fs/orangefs/orangefs-cache.c
index 900a2e38e11bc9e7ac82f386ce678bdad0756c65..b6edbe9fb309eae431194a13d887f2fa934981c0 100644 (file)
--- a/fs/orangefs/orangefs-cache.c
+++ b/fs/orangefs/orangefs-cache.c
@@ -136,10 +136,10 @@ struct orangefs_kernel_op_s *op_alloc(__s32 type)
                             llu(new_op->tag),
                             get_opname_string(new_op));
 
-               new_op->upcall.uid = from_kuid(current_user_ns(),
+               new_op->upcall.uid = from_kuid(&init_user_ns,
                                               current_fsuid());
 
-               new_op->upcall.gid = from_kgid(current_user_ns(),
+               new_op->upcall.gid = from_kgid(&init_user_ns,
                                               current_fsgid());
        } else {
                gossip_err("op_alloc: kmem_cache_zalloc failed!\n");