Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0ee9aab authored by Davide Libenzi's avatar Davide Libenzi Committed by Linus Torvalds
Browse files

epoll: move kfree inside ep_free 



Move the kfree() call inside the ep_free() function.

Signed-off-by: default avatarDavide Libenzi <davidel@xmailserver.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 67647d0f

fs/eventpoll.c

+2 −5
Original line number Original line Diff line number Diff line
@@ -469,18 +469,16 @@ static void ep_free(struct eventpoll *ep) 
	}

	}





	mutex_unlock(&epmutex);

	mutex_unlock(&epmutex);



	mutex_destroy(&ep->mtx);

	mutex_destroy(&ep->mtx);

	kfree(ep);

}

}





static int ep_eventpoll_release(struct inode *inode, struct file *file)

static int ep_eventpoll_release(struct inode *inode, struct file *file)

{

{

	struct eventpoll *ep = file->private_data;

	struct eventpoll *ep = file->private_data;





	if (ep) {

	if (ep)

		ep_free(ep);

		ep_free(ep);

		kfree(ep);

	}





	DNPRINTK(3, (KERN_INFO "[%p] eventpoll: close() ep=%p\n", current, ep));

	DNPRINTK(3, (KERN_INFO "[%p] eventpoll: close() ep=%p\n", current, ep));

	return 0;

	return 0;
@@ -1107,7 +1105,6 @@ asmlinkage long sys_epoll_create(int size) 




error_free:

error_free:

	ep_free(ep);

	ep_free(ep);

	kfree(ep);

error_return:

error_return:

	DNPRINTK(3, (KERN_INFO "[%p] eventpoll: sys_epoll_create(%d) = %d\n",

	DNPRINTK(3, (KERN_INFO "[%p] eventpoll: sys_epoll_create(%d) = %d\n",

		     current, size, error));

		     current, size, error));