X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=fs%2Ffcntl.c;h=8685263ccc4a7aa51d6666136c285687393bfabb;hb=c41d4f09f13671f98ba4b82fdc94420cdc09be08;hp=c9db73fc5e3d2d2e137bab66724d4c91f3d7544c;hpb=fb9fc395174138983a49f2da982ed14caabbe741;p=powerpc.git

diff --git a/fs/fcntl.c b/fs/fcntl.c
index c9db73fc5e..8685263ccc 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -18,6 +18,7 @@
 #include <linux/ptrace.h>
 #include <linux/signal.h>
 #include <linux/rcupdate.h>
+#include <linux/pid_namespace.h>
 
 #include <asm/poll.h>
 #include <asm/siginfo.h>
@@ -292,7 +293,7 @@ int f_setown(struct file *filp, unsigned long arg, int force)
 		who = -who;
 	}
 	rcu_read_lock();
-	pid = find_pid(who);
+	pid = find_vpid(who);
 	result = __f_setown(filp, pid, type, force);
 	rcu_read_unlock();
 	return result;
@@ -308,7 +309,7 @@ pid_t f_getown(struct file *filp)
 {
 	pid_t pid;
 	read_lock(&filp->f_owner.lock);
-	pid = pid_nr(filp->f_owner.pid);
+	pid = pid_nr_ns(filp->f_owner.pid, current->nsproxy->pid_ns);
 	if (filp->f_owner.pid_type == PIDTYPE_PGID)
 		pid = -pid;
 	read_unlock(&filp->f_owner.lock);