From faf4d27b188747214442f0a4ee4ebb60c79ff5fb Mon Sep 17 00:00:00 2001 From: Al Viro Date: Tue, 22 Apr 2008 01:32:44 -0400 Subject: [PATCH] --- yaml --- r: 91921 b: refs/heads/master c: 9b4f526cdc0f95f635607dfba6ac788b3deca188 h: refs/heads/master i: 91919: c522da3300fe855a3c175366513c9fc0a8abfb1a v: v3 --- [refs] | 2 +- trunk/fs/proc/base.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3a1873e8b254..122fd8bce9ff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed1524371716466e9c762808b02601d0d0276a92 +refs/heads/master: 9b4f526cdc0f95f635607dfba6ac788b3deca188 diff --git a/trunk/fs/proc/base.c b/trunk/fs/proc/base.c index 81d7d145292a..7313c62e3e9d 100644 --- a/trunk/fs/proc/base.c +++ b/trunk/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;