From c740e4f7cda744ac64aea4b697381fce182d7fe2 Mon Sep 17 00:00:00 2001
From: Davide Libenzi <davidel@xmailserver.org>
Date: Tue, 15 May 2007 01:40:57 -0700
Subject: [PATCH] --- yaml --- r: 56388 b: refs/heads/master c:
 f0ee9aabb0520adea5937855a9575c08a97b16e7 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/fs/eventpoll.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index a09db08fd6bd..ab058df75c0e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67647d0fb8bc03609d045a9cce85f7ef6d763036
+refs/heads/master: f0ee9aabb0520adea5937855a9575c08a97b16e7
diff --git a/trunk/fs/eventpoll.c b/trunk/fs/eventpoll.c
index d4255be29bc6..0b73cd45a06d 100644
--- a/trunk/fs/eventpoll.c
+++ b/trunk/fs/eventpoll.c
@@ -469,18 +469,16 @@ static void ep_free(struct eventpoll *ep)
 	}
 
 	mutex_unlock(&epmutex);
-
 	mutex_destroy(&ep->mtx);
+	kfree(ep);
 }
 
 static int ep_eventpoll_release(struct inode *inode, struct file *file)
 {
 	struct eventpoll *ep = file->private_data;
 
-	if (ep) {
+	if (ep)
 		ep_free(ep);
-		kfree(ep);
-	}
 
 	DNPRINTK(3, (KERN_INFO "[%p] eventpoll: close() ep=%p\n", current, ep));
 	return 0;
@@ -1107,7 +1105,6 @@ asmlinkage long sys_epoll_create(int size)
 
 error_free:
 	ep_free(ep);
-	kfree(ep);
 error_return:
 	DNPRINTK(3, (KERN_INFO "[%p] eventpoll: sys_epoll_create(%d) = %d\n",
 		     current, size, error));