Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f0ee9aabb0520adea5937855a9575c08a97b16e7 Commit: f0ee9aabb0520adea5937855a9575c08a97b16e7 Parent: 67647d0fb8bc03609d045a9cce85f7ef6d763036 Author: Davide Libenzi <[EMAIL PROTECTED]> AuthorDate: Tue May 15 01:40:57 2007 -0700 Committer: Linus Torvalds <[EMAIL PROTECTED]> CommitDate: Tue May 15 08:54:00 2007 -0700
epoll: move kfree inside ep_free Move the kfree() call inside the ep_free() function. Signed-off-by: Davide Libenzi <[EMAIL PROTECTED]> Signed-off-by: Andrew Morton <[EMAIL PROTECTED]> Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]> --- fs/eventpoll.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/fs/eventpoll.c b/fs/eventpoll.c index d4255be..0b73cd4 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)); - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html