Commit-ID: 65e53aab6d54385dea799356defcbdcc456fb1a7 Gitweb: https://git.kernel.org/tip/65e53aab6d54385dea799356defcbdcc456fb1a7 Author: Christoph Hellwig <h...@lst.de> AuthorDate: Wed, 25 Oct 2017 17:55:57 +0900 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Wed, 25 Oct 2017 12:18:59 +0200
block: Use DECLARE_COMPLETION_ONSTACK() in submit_bio_wait() Simplify the code by getting rid of the submit_bio_ret structure. (This also helps address a lockdep false positive.) Signed-off-by: Christoph Hellwig <h...@lst.de> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Thomas Gleixner <t...@linutronix.de> Cc: amir7...@gmail.com Cc: ax...@kernel.dk Cc: darrick.w...@oracle.com Cc: da...@fromorbit.com Cc: h...@infradead.org Cc: idryo...@gmail.com Cc: jo...@kernel.org Cc: johannes.b...@intel.com Cc: kernel-t...@lge.com Cc: linux-bl...@vger.kernel.org Cc: linux-fsde...@vger.kernel.org Cc: linux...@kvack.org Cc: linux-...@vger.kernel.org Cc: o...@redhat.com Cc: t...@kernel.org Link: http://lkml.kernel.org/r/1508921765-15396-2-git-send-email-byungchul.p...@lge.com Signed-off-by: Ingo Molnar <mi...@kernel.org> --- block/bio.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/block/bio.c b/block/bio.c index 101c2a9..5e901bf 100644 --- a/block/bio.c +++ b/block/bio.c @@ -917,17 +917,9 @@ int bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter) } EXPORT_SYMBOL_GPL(bio_iov_iter_get_pages); -struct submit_bio_ret { - struct completion event; - int error; -}; - static void submit_bio_wait_endio(struct bio *bio) { - struct submit_bio_ret *ret = bio->bi_private; - - ret->error = blk_status_to_errno(bio->bi_status); - complete(&ret->event); + complete(bio->bi_private); } /** @@ -943,16 +935,15 @@ static void submit_bio_wait_endio(struct bio *bio) */ int submit_bio_wait(struct bio *bio) { - struct submit_bio_ret ret; + DECLARE_COMPLETION_ONSTACK(done); - init_completion(&ret.event); - bio->bi_private = &ret; + bio->bi_private = &done; bio->bi_end_io = submit_bio_wait_endio; bio->bi_opf |= REQ_SYNC; submit_bio(bio); - wait_for_completion_io(&ret.event); + wait_for_completion_io(&done); - return ret.error; + return blk_status_to_errno(bio->bi_status); } EXPORT_SYMBOL(submit_bio_wait);
