diff options
Diffstat (limited to 'fs/fcntl.c')
-rw-r--r-- | fs/fcntl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/fcntl.c b/fs/fcntl.c index 8685263ccc4a..e632da761fc1 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include <asm/siginfo.h> | 24 | #include <asm/siginfo.h> |
25 | #include <asm/uaccess.h> | 25 | #include <asm/uaccess.h> |
26 | 26 | ||
27 | void fastcall set_close_on_exec(unsigned int fd, int flag) | 27 | void set_close_on_exec(unsigned int fd, int flag) |
28 | { | 28 | { |
29 | struct files_struct *files = current->files; | 29 | struct files_struct *files = current->files; |
30 | struct fdtable *fdt; | 30 | struct fdtable *fdt; |
@@ -309,7 +309,7 @@ pid_t f_getown(struct file *filp) | |||
309 | { | 309 | { |
310 | pid_t pid; | 310 | pid_t pid; |
311 | read_lock(&filp->f_owner.lock); | 311 | read_lock(&filp->f_owner.lock); |
312 | pid = pid_nr_ns(filp->f_owner.pid, current->nsproxy->pid_ns); | 312 | pid = pid_vnr(filp->f_owner.pid); |
313 | if (filp->f_owner.pid_type == PIDTYPE_PGID) | 313 | if (filp->f_owner.pid_type == PIDTYPE_PGID) |
314 | pid = -pid; | 314 | pid = -pid; |
315 | read_unlock(&filp->f_owner.lock); | 315 | read_unlock(&filp->f_owner.lock); |