diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
commit | 185a257f2f73bcd89050ad02da5bedbc28fc43fa (patch) | |
tree | 5e32586114534ed3f2165614cba3d578f5d87307 /fs/file.c | |
parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
download | kernel-crypto-185a257f2f73bcd89050ad02da5bedbc28fc43fa.tar.gz kernel-crypto-185a257f2f73bcd89050ad02da5bedbc28fc43fa.tar.xz kernel-crypto-185a257f2f73bcd89050ad02da5bedbc28fc43fa.zip |
Merge branch 'master' into gfs2
Diffstat (limited to 'fs/file.c')
-rw-r--r-- | fs/file.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/file.c b/fs/file.c index b3c6b82e6a9..8d3bfca7714 100644 --- a/fs/file.c +++ b/fs/file.c @@ -281,10 +281,8 @@ static struct fdtable *alloc_fdtable(int nr) out2: nfds = fdt->max_fdset; out: - if (new_openset) - free_fdset(new_openset, nfds); - if (new_execset) - free_fdset(new_execset, nfds); + free_fdset(new_openset, nfds); + free_fdset(new_execset, nfds); kfree(fdt); return NULL; } |