[PATCH v4 1/7] block: use DECLARE_COMPLETION_ONSTACK in submit_bio_wait

[Byungchul Park]

From: Christoph Hellwig <h...@lst.de>

Simplify the code by getting rid of the submit_bio_ret structure.

Signed-off-by: Christoph Hellwig <h...@lst.de>
---
 block/bio.c | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/block/bio.c b/block/bio.c
index 5f5472e..99d0ca5 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);
 
-- 
1.9.1