summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2013-03-02 15:25:55 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2013-03-07 14:27:30 +1100
commitf0e26ee490d741c9eb30d80917fc6ef87e52f49d (patch)
treecc90ae539237f20aa1403980352b7a22274dd30b /fs
parent41aebf166045783596cbadf0be92a555e70145a0 (diff)
block-aio-batch-completion-for-bios-kiocbs-fix-fix-fix-fix-fix-fix
fix tracepoint in batch_complete() Cc: Kent Overstreet <koverstreet@google.com> Cc: Minchan Kim <minchan@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/bio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/bio.c b/fs/bio.c
index 78712d477d55..0cc1b5562abc 100644
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -1426,6 +1426,8 @@ void bio_endio_batch(struct bio *bio, int error, struct batch_complete *batch)
if (error)
bio->bi_error = error;
+ trace_block_bio_complete(bio, error);
+
if (batch)
bio_list_add(&batch->bio, bio);
else
@@ -1441,8 +1443,6 @@ void batch_complete(struct batch_complete *batch)
while ((bio = bio_list_pop(&batch->bio)))
__bio_endio(bio, batch);
- trace_block_bio_complete(bio, error);
-
batch_complete_aio(batch);
}
EXPORT_SYMBOL(batch_complete);