summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-10-03 01:13:52 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-03 08:03:41 -0700
commitc3b6571384024be31e8b3442c0e7c3b127110d9b (patch)
tree24281e244579d97eb944d7b48e0036f27db4fe3c
parente1ca66d1b990b23e7753c729332c0ada61f4f38d (diff)
downloadop-kernel-dev-c3b6571384024be31e8b3442c0e7c3b127110d9b.zip
op-kernel-dev-c3b6571384024be31e8b3442c0e7c3b127110d9b.tar.gz
[PATCH] fs/eventpoll: error handling micro-cleanup
While reviewing the 'may be used uninitialized' bogus gcc warnings, I noticed that an error code assignment was only needed if an error had actually occured. Signed-off-by: Jeff Garzik <jeff@garzik.org> Cc: Davide Libenzi <davidel@xmailserver.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--fs/eventpoll.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 8d54433..557d5b6 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -720,9 +720,10 @@ static int ep_getfd(int *efd, struct inode **einode, struct file **efile,
/* Allocates an inode from the eventpoll file system */
inode = ep_eventpoll_inode();
- error = PTR_ERR(inode);
- if (IS_ERR(inode))
+ if (IS_ERR(inode)) {
+ error = PTR_ERR(inode);
goto eexit_2;
+ }
/* Allocates a free descriptor to plug the file onto */
error = get_unused_fd();
OpenPOWER on IntegriCloud