From f0ee9aabb0520adea5937855a9575c08a97b16e7 Mon Sep 17 00:00:00 2001 From: Davide Libenzi Date: Tue, 15 May 2007 01:40:57 -0700 Subject: [PATCH] epoll: move kfree inside ep_free Move the kfree() call inside the ep_free() function. Signed-off-by: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- fs/eventpoll.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/fs/eventpoll.c b/fs/eventpoll.c index d4255be29bc..0b73cd45a06 100644 --- a/fs/eventpoll.c +++ b/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)); -- 2.32.0.93.g670b81a890