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

Commit d29c445b authored by Kent Overstreet's avatar Kent Overstreet Committed by Benjamin LaHaise
Browse files

aio: Kill ki_dtor 



sock_aio_dtor() is dead code - and stuff that does need to do cleanup
can simply do it before calling aio_complete().

Signed-off-by: default avatarKent Overstreet <koverstreet@google.com>
Cc: Zach Brown <zab@redhat.com>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Asai Thambi S P <asamymuthupa@micron.com>
Cc: Selvan Mani <smani@micron.com>
Cc: Sam Bradshaw <sbradshaw@micron.com>
Cc: Jeff Moyer <jmoyer@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Benjamin LaHaise <bcrl@kvack.org>
Cc: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarBenjamin LaHaise <bcrl@kvack.org>
parent 57282d8f

fs/aio.c

+0 −2
Original line number Diff line number Diff line
@@ -705,8 +705,6 @@ static void kiocb_free(struct kiocb *req) 
		fput(req->ki_filp);

	if (req->ki_eventfd != NULL)

		eventfd_ctx_put(req->ki_eventfd);

	if (req->ki_dtor)

		req->ki_dtor(req);

	kmem_cache_free(kiocb_cachep, req);

}

include/linux/aio.h

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ struct kiocb { 
	struct file		*ki_filp;

	struct kioctx		*ki_ctx;	/* NULL for sync ops */

	kiocb_cancel_fn		*ki_cancel;

	void			(*ki_dtor)(struct kiocb *);

	void			*private;



	union {

net/socket.c

+2 −11
Original line number Diff line number Diff line
@@ -854,11 +854,6 @@ int kernel_recvmsg(struct socket *sock, struct msghdr *msg, 
}

EXPORT_SYMBOL(kernel_recvmsg);



static void sock_aio_dtor(struct kiocb *iocb)

{

	kfree(iocb->private);

}



static ssize_t sock_sendpage(struct file *file, struct page *page,

			     int offset, size_t size, loff_t *ppos, int more)

{
@@ -889,12 +884,8 @@ static ssize_t sock_splice_read(struct file *file, loff_t *ppos, 
static struct sock_iocb *alloc_sock_iocb(struct kiocb *iocb,

					 struct sock_iocb *siocb)

{

	if (!is_sync_kiocb(iocb)) {

		siocb = kmalloc(sizeof(*siocb), GFP_KERNEL);

		if (!siocb)

			return NULL;

		iocb->ki_dtor = sock_aio_dtor;

	}

	if (!is_sync_kiocb(iocb))

		BUG();



	siocb->kiocb = iocb;

	iocb->private = siocb;