diff mbox series

[02/36] aio: remove an outdated comment in aio_complete

Message ID	20180117192742.710-3-hch@lst.de
State	Not Applicable, archived
Delegated to:	David Miller
Headers	show Return-Path: <netdev-owner@vger.kernel.org> From: Christoph Hellwig <hch@lst.de> To: viro@zeniv.linux.org.uk Cc: Avi Kivity <avi@scylladb.com>, linux-aio@kvack.org, linux-fsdevel@vger.kernel.org, netdev@vger.kernel.org, linux-api@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 02/36] aio: remove an outdated comment in aio_complete Date: Wed, 17 Jan 2018 20:27:08 +0100 Message-Id: <20180117192742.710-3-hch@lst.de> In-Reply-To: <20180117192742.710-1-hch@lst.de> References: <20180117192742.710-1-hch@lst.de> Sender: netdev-owner@vger.kernel.org Precedence: bulk
Series	[01/36] aio: don't print the page size at boot time \| expand [01/36] aio: don't print the page size at boot time [02/36] aio: remove an outdated comment in aio_complete [03/36] aio: refactor read/write iocb setup [04/36] aio: sanitize ki_list handling [05/36] aio: simplify cancellation [06/36] aio: delete iocbs from the active_reqs list in kiocb_cancel [07/36] aio: add delayed cancel support [08/36] aio: implement io_pgetevents [09/36] fs: unexport poll_schedule_timeout [10/36] fs: cleanup do_pollfd [11/36] fs: update documentation for __poll_t [12/36] fs: add new vfs_poll and file_can_poll helpers [13/36] fs: introduce new ->get_poll_head and ->poll_mask methods [14/36] aio: implement IOCB_CMD_POLL [15/36] net: refactor socket_poll [16/36] net: add support for ->poll_mask in proto_ops [17/36] net: remove sock_no_poll [18/36] net/tcp: convert to ->poll_mask [19/36] net/unix: convert to ->poll_mask [20/36] net: convert datagram_poll users tp ->poll_mask [21/36] net/dccp: convert to ->poll_mask [22/36] net/atm: convert to ->poll_mask [23/36] net/vmw_vsock: convert to ->poll_mask [24/36] net/tipc: convert to ->poll_mask [25/36] net/sctp: convert to ->poll_mask [26/36] net/bluetooth: convert to ->poll_mask [27/36] net/caif: convert to ->poll_mask [28/36] net/nfc: convert to ->poll_mask [29/36] net/phonet: convert to ->poll_mask [30/36] net/iucv: convert to ->poll_mask [31/36] net/rxrpc: convert to ->poll_mask [32/36] crypto: af_alg: convert to ->poll_mask [33/36] pipe: convert to ->poll_mask [34/36] eventfd: switch to ->poll_mask [35/36] timerfd: convert to ->poll_mask [36/36] random: convert to ->poll_mask

Commit Message

Christoph Hellwig Jan. 17, 2018, 7:27 p.m. UTC

These days we don't treat sync iocbs special in the aio completion code as
they never use it.  Remove the old comment, and move the BUG_ON for a sync
iocb to the top of the function.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Jeff Moyer <jmoyer@redhat.com>
---
 fs/aio.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff mbox series

Patch

diff --git a/fs/aio.c b/fs/aio.c
index 03d59593912d..41fc8ce6bc7f 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -1088,6 +1088,8 @@  static void aio_complete(struct kiocb *kiocb, long res, long res2)
 	unsigned tail, pos, head;
 	unsigned long	flags;
 
+	BUG_ON(is_sync_kiocb(kiocb));
+
 	if (kiocb->ki_flags & IOCB_WRITE) {
 		struct file *file = kiocb->ki_filp;
 
@@ -1100,15 +1102,6 @@  static void aio_complete(struct kiocb *kiocb, long res, long res2)
 		file_end_write(file);
 	}
 
-	/*
-	 * Special case handling for sync iocbs:
-	 *  - events go directly into the iocb for fast handling
-	 *  - the sync task with the iocb in its stack holds the single iocb
-	 *    ref, no other paths have a way to get another ref
-	 *  - the sync task helpfully left a reference to itself in the iocb
-	 */
-	BUG_ON(is_sync_kiocb(kiocb));
-
 	if (iocb->ki_list.next) {
 		unsigned long flags;