diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-22 04:34:08 +0200 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-22 04:34:08 +0200 |
commit | a3536c839f04682ed06c84a7f75968c27c6108c8 (patch) | |
tree | 92c26ea74c0ffb9b83a2285ad2539cc271b09856 /fs/file.c | |
parent | [PATCH] Updated ipw2200 to compile with ieee80211 abg_ture to abg_true change (diff) | |
parent | [PATCH] uml: fix compile warning after consolidation patch (diff) | |
download | linux-a3536c839f04682ed06c84a7f75968c27c6108c8.tar.xz linux-a3536c839f04682ed06c84a7f75968c27c6108c8.zip |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'fs/file.c')
-rw-r--r-- | fs/file.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/fs/file.c b/fs/file.c index 2127a7b9dc3a..fd066b261c75 100644 --- a/fs/file.c +++ b/fs/file.c @@ -69,13 +69,9 @@ void free_fd_array(struct file **array, int num) static void __free_fdtable(struct fdtable *fdt) { - int fdset_size, fdarray_size; - - fdset_size = fdt->max_fdset / 8; - fdarray_size = fdt->max_fds * sizeof(struct file *); - free_fdset(fdt->open_fds, fdset_size); - free_fdset(fdt->close_on_exec, fdset_size); - free_fd_array(fdt->fd, fdarray_size); + free_fdset(fdt->open_fds, fdt->max_fdset); + free_fdset(fdt->close_on_exec, fdt->max_fdset); + free_fd_array(fdt->fd, fdt->max_fds); kfree(fdt); } |