linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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,
	linux-api@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/9] aio: remove an outdated comment in aio_complete
Date: Wed, 21 Mar 2018 08:32:25 +0100	[thread overview]
Message-ID: <20180321073232.13366-3-hch@lst.de> (raw)
In-Reply-To: <20180321073232.13366-1-hch@lst.de>

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>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 fs/aio.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

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;
 
-- 
2.14.2

  parent reply	other threads:[~2018-03-21  7:32 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-21  7:32 io_pgetevents & aio fsync Christoph Hellwig
2018-03-21  7:32 ` [PATCH 1/9] aio: don't print the page size at boot time Christoph Hellwig
2018-03-21  9:12   ` Greg KH
2018-03-21  7:32 ` Christoph Hellwig [this message]
2018-03-21  9:14   ` [PATCH 2/9] aio: remove an outdated comment in aio_complete Greg KH
2018-03-21  9:17     ` Christoph Hellwig
2018-03-21  7:32 ` [PATCH 3/9] aio: refactor read/write iocb setup Christoph Hellwig
2018-03-21  9:15   ` Greg KH
2018-03-21  7:32 ` [PATCH 4/9] aio: sanitize ki_list handling Christoph Hellwig
2018-03-21  9:16   ` Greg KH
2018-03-22 15:24   ` Al Viro
2018-03-22 17:04     ` Christoph Hellwig
2018-03-21  7:32 ` [PATCH 5/9] aio: simplify cancellation Christoph Hellwig
2018-03-21  9:17   ` Greg KH
2018-03-21 16:23   ` Darrick J. Wong
2018-03-21  7:32 ` [PATCH 6/9] aio: delete iocbs from the active_reqs list in kiocb_cancel Christoph Hellwig
2018-03-21  9:17   ` Greg KH
2018-03-21 16:23   ` Darrick J. Wong
2018-03-21  7:32 ` [PATCH 7/9] aio: add delayed cancel support Christoph Hellwig
2018-03-21  9:18   ` Greg KH
2018-03-21 16:23   ` Darrick J. Wong
2018-03-22 16:33   ` Al Viro
2018-03-21  7:32 ` [PATCH 8/9] aio: implement io_pgetevents Christoph Hellwig
2018-03-21  9:24   ` Greg KH
2018-03-21  9:29     ` Christoph Hellwig
2018-03-21 14:39       ` Greg KH
2018-03-21 16:26   ` Darrick J. Wong
2018-03-21  7:32 ` [PATCH 9/9] aio: implement IOCB_CMD_FSYNC and IOCB_CMD_FDSYNC Christoph Hellwig
2018-03-21  9:27   ` Greg KH
2018-03-21  9:30     ` Christoph Hellwig
2018-03-21 16:26   ` Darrick J. Wong
2018-03-22 16:36 ` io_pgetevents & aio fsync Al Viro
2018-03-22 16:36   ` Al Viro

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180321073232.13366-3-hch@lst.de \
    --to=hch@lst.de \
    --cc=avi@scylladb.com \
    --cc=linux-aio@kvack.org \
    --cc=linux-api@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=viro@zeniv.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).