Fix ZERO_PAGE breakage with vmware

[pandora-kernel.git] / fs / fcntl.c

diff --git a/fs/fcntl.c b/fs/fcntl.c
index c9db73f..bfd7765 100644 (file)
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -9,6 +9,7 @@
 #include <linux/mm.h>
 #include <linux/fs.h>
 #include <linux/file.h>
+#include <linux/fdtable.h>
 #include <linux/capability.h>
 #include <linux/dnotify.h>
 #include <linux/smp_lock.h>
@@ -18,12 +19,13 @@
 #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/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;
@@ -54,14 +56,16 @@ static int get_close_on_exec(unsigned int fd)
  * file_lock held for write.
  */
 
-static int locate_fd(struct files_struct *files, 
-                           struct file *file, unsigned int orig_start)
+static int locate_fd(unsigned int orig_start, int cloexec)
 {
+       struct files_struct *files = current->files;
        unsigned int newfd;
        unsigned int start;
        int error;
        struct fdtable *fdt;
 
+       spin_lock(&files->file_lock);
+
        error = -EINVAL;
        if (orig_start >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
                goto out;
@@ -96,42 +100,28 @@ repeat:
        if (error)
                goto repeat;
 
-       /*
-        * We reacquired files_lock, so we are safe as long as
-        * we reacquire the fdtable pointer and use it while holding
-        * the lock, no one can free it during that time.
-        */
        if (start <= files->next_fd)
                files->next_fd = newfd + 1;
 
+       FD_SET(newfd, fdt->open_fds);
+       if (cloexec)
+               FD_SET(newfd, fdt->close_on_exec);
+       else
+               FD_CLR(newfd, fdt->close_on_exec);
        error = newfd;
-       
+
 out:
+       spin_unlock(&files->file_lock);
        return error;
 }
 
 static int dupfd(struct file *file, unsigned int start, int cloexec)
 {
-       struct files_struct * files = current->files;
-       struct fdtable *fdt;
-       int fd;
-
-       spin_lock(&files->file_lock);
-       fd = locate_fd(files, file, start);
-       if (fd >= 0) {
-               /* locate_fd() may have expanded fdtable, load the ptr */
-               fdt = files_fdtable(files);
-               FD_SET(fd, fdt->open_fds);
-               if (cloexec)
-                       FD_SET(fd, fdt->close_on_exec);
-               else
-                       FD_CLR(fd, fdt->close_on_exec);
-               spin_unlock(&files->file_lock);
+       int fd = locate_fd(start, cloexec);
+       if (fd >= 0)
                fd_install(fd, file);
-       } else {
-               spin_unlock(&files->file_lock);
+       else
                fput(file);
-       }
 
        return fd;
 }
@@ -292,7 +282,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 +298,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_vnr(filp->f_owner.pid);
        if (filp->f_owner.pid_type == PIDTYPE_PGID)
                pid = -pid;
        read_unlock(&filp->f_owner.lock);