Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  [PATCH] get rid of __exit_files(), __exit_fs() and __put_fs_struct()
  [PATCH] proc_readfd_common() race fix
  [PATCH] double-free of inode on alloc_file() failure exit in create_write_pipe()
  [PATCH] teach seq_file to discard entries
  [PATCH] umount_tree() will unhash everything itself
  [PATCH] get rid of more nameidata passing in namespace.c
  [PATCH] switch a bunch of LSM hooks from nameidata to path
  [PATCH] lock exclusively in collect_mounts() and drop_collected_mounts()
  [PATCH] move a bunch of declarations to fs/internal.h

1 files changed, 1 insertions, 3 deletions

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 81d7d145292a..7313c62e3e9d 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -1626,7 +1626,6 @@ static int proc_readfd_common(struct file * filp, void * dirent,
         unsigned int fd, ino;
         int retval;
         struct files_struct * files;
-        struct fdtable *fdt;
 
         retval = -ENOENT;
         if (!p)
@@ -1649,9 +1648,8 @@ static int proc_readfd_common(struct file * filp, void * dirent,
                         if (!files)
                                 goto out;
                         rcu_read_lock();
-                        fdt = files_fdtable(files);
                         for (fd = filp->f_pos-2;
-                             fd < fdt->max_fds;
+                             fd < files_fdtable(files)->max_fds;
                              fd++, filp->f_pos++) {
                                 char name[PROC_NUMBUF];
                                 int len;