2.6.24-git22

 fs

diff --git a/fs/fcntl.c b/fs/fcntl.c
index 8685263..e632da7 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -24,7 +24,7 @@
 #include <asm/siginfo.h>
 #include <asm/uaccess.h>
 
-void fastcall set_close_on_exec(unsigned int fd, int flag)
+void set_close_on_exec(unsigned int fd, int flag)
 {
    struct files_struct *files = current->files;
    struct fdtable *fdt;
@@ -309,7 +309,7 @@ pid_t f_getown(struct file *filp)
 {
    pid_t pid;
    read_lock(&filp->f_owner.lock);
-   pid = pid_nr_ns(filp->f_owner.pid, current->nsproxy->pid_ns);
+   pid = pid_vnr(filp->f_owner.pid);
    if (filp->f_owner.pid_type == PIDTYPE_PGID)
       pid = -pid;
    read_unlock(&filp->f_owner.lock);