diff options
| author | Davide Libenzi <davidel@xmailserver.org> | 2007-05-15 01:40:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-15 08:54:00 -0700 |
| commit | f0ee9aabb0520adea5937855a9575c08a97b16e7 (patch) | |
| tree | 9dd47c449b3de44302bc023f64d14c1fe18266b4 /fs/eventpoll.c | |
| parent | 67647d0fb8bc03609d045a9cce85f7ef6d763036 (diff) | |
| download | linux-3.10-f0ee9aabb0520adea5937855a9575c08a97b16e7.tar.gz linux-3.10-f0ee9aabb0520adea5937855a9575c08a97b16e7.tar.bz2 linux-3.10-f0ee9aabb0520adea5937855a9575c08a97b16e7.zip | |
epoll: move kfree inside ep_free
Move the kfree() call inside the ep_free() function.
Signed-off-by: Davide Libenzi <davidel@xmailserver.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/eventpoll.c')
| -rw-r--r-- | fs/eventpoll.c | 7 |
1 files 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)); |