From: Andrew Morton <akpm@osdl.org>
Date: Wed, 27 Sep 2006 08:51:02 +0000 (-0700)
Subject: [PATCH] alloc_fdtable() cleanup
X-Git-Tag: firefly_0821_release~33289
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8b0e330b7720a206339887044fa275bf537a5264;p=firefly-linux-kernel-4.4.55.git

[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>
---

diff --git a/fs/file.c b/fs/file.c
index b3c6b82e6a9d..8d3bfca7714b 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;
 }