summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-09-27 01:51:02 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-27 08:26:19 -0700
commit8b0e330b7720a206339887044fa275bf537a5264 (patch)
treef76b1e82f09988aef047a1d8b2636bee93eab92e
parent07563c711fbc25389e58ab9c9f0b9de2fce56760 (diff)
downloadop-kernel-dev-8b0e330b7720a206339887044fa275bf537a5264.zip
op-kernel-dev-8b0e330b7720a206339887044fa275bf537a5264.tar.gz
[PATCH] alloc_fdtable() cleanup
free_fdset(NULL, ...) is legal. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--fs/file.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/file.c b/fs/file.c
index b3c6b82..8d3bfca 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;
}
OpenPOWER on IntegriCloud