projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[GFS2] Don't hold page lock when starting transaction
[powerpc.git]
/
fs
/
fcntl.c
diff --git
a/fs/fcntl.c
b/fs/fcntl.c
index
c9db73f
..
8685263
100644
(file)
--- 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/ptrace.h>
#include <linux/signal.h>
#include <linux/rcupdate.h>
+#include <linux/pid_namespace.h>
#include <asm/poll.h>
#include <asm/siginfo.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();
who = -who;
}
rcu_read_lock();
- pid = find_pid(who);
+ pid = find_
v
pid(who);
result = __f_setown(filp, pid, type, force);
rcu_read_unlock();
return result;
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_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);
if (filp->f_owner.pid_type == PIDTYPE_PGID)
pid = -pid;
read_unlock(&filp->f_owner.lock);