Merge tag 'pull-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-block.git] / fs / proc / fd.c

diff --git a/fs/proc/fd.c b/fs/proc/fd.c
index f4b1c8b42a511320f6586a6ccd530b17d990aa42..586bbc84ca04307a4962f6d06bca9409b206e080 100644 (file)
--- a/fs/proc/fd.c
+++ b/fs/proc/fd.c
@@ -39,10 +39,8 @@ static int seq_show(struct seq_file *m, void *v)
                spin_lock(&files->file_lock);
                file = files_lookup_fd_locked(files, fd);
                if (file) {
-                       struct fdtable *fdt = files_fdtable(files);
-
                        f_flags = file->f_flags;
-                       if (close_on_exec(fd, fdt))
+                       if (close_on_exec(fd, files))
                                f_flags |= O_CLOEXEC;
 
                        get_file(file);