diff for duplicates of <20171020144451.GA16793@infradead.org> diff --git a/a/1.txt b/N1/1.txt index 0cf0d32..0605526 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -73,3 +73,9 @@ index 8338304ea256..4e18e959fc0a 100644 -- 2.14.2 + +-- +To unsubscribe, send a message with 'unsubscribe linux-mm' in +the body to majordomo@kvack.org. For more info on Linux MM, +see: http://www.linux-mm.org/ . +Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N1/content_digest index b86306b..64101fc 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -98,6 +98,12 @@ " EXPORT_SYMBOL(submit_bio_wait);\n" " \n" "-- \n" - 2.14.2 + "2.14.2\n" + "\n" + "--\n" + "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" + "the body to majordomo@kvack.org. For more info on Linux MM,\n" + "see: http://www.linux-mm.org/ .\n" + "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" -8ecc67b06f964fdaa2c3cda0e1a1f8a87c8b15c1cb9553fbb86e296af29e8895 +18ad52d9ce2f9d4a744e976a6904677cda55b1a3a0cf805e8fc71b67b7ffbcb5
diff --git a/a/1.txt b/N2/1.txt index 0cf0d32..007152d 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -15,61 +15,3 @@ DECLARE_COMPLETION_ONSTACK with the lockdep annotations. Patch below for reference: --- ->From d65b89843c9f82c0744643515ba51dd10e66e67b Mon Sep 17 00:00:00 2001 -From: Christoph Hellwig <hch@lst.de> -Date: Thu, 5 Oct 2017 18:31:02 +0200 -Subject: block: use DECLARE_COMPLETION_ONSTACK in submit_bio_wait - -Simplify the code by getting rid of the submit_bio_ret structure. - -Signed-off-by: Christoph Hellwig <hch@lst.de> ---- - block/bio.c | 19 +++++-------------- - 1 file changed, 5 insertions(+), 14 deletions(-) - -diff --git a/block/bio.c b/block/bio.c -index 8338304ea256..4e18e959fc0a 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); - --- -2.14.2 diff --git a/a/content_digest b/N2/content_digest index b86306b..f9c00dd 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -40,64 +40,6 @@ "\n" "Patch below for reference:\n" "\n" - "---\n" - ">From d65b89843c9f82c0744643515ba51dd10e66e67b Mon Sep 17 00:00:00 2001\n" - "From: Christoph Hellwig <hch@lst.de>\n" - "Date: Thu, 5 Oct 2017 18:31:02 +0200\n" - "Subject: block: use DECLARE_COMPLETION_ONSTACK in submit_bio_wait\n" - "\n" - "Simplify the code by getting rid of the submit_bio_ret structure.\n" - "\n" - "Signed-off-by: Christoph Hellwig <hch@lst.de>\n" - "---\n" - " block/bio.c | 19 +++++--------------\n" - " 1 file changed, 5 insertions(+), 14 deletions(-)\n" - "\n" - "diff --git a/block/bio.c b/block/bio.c\n" - "index 8338304ea256..4e18e959fc0a 100644\n" - "--- a/block/bio.c\n" - "+++ b/block/bio.c\n" - "@@ -917,17 +917,9 @@ int bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)\n" - " }\n" - " EXPORT_SYMBOL_GPL(bio_iov_iter_get_pages);\n" - " \n" - "-struct submit_bio_ret {\n" - "-\tstruct completion event;\n" - "-\tint error;\n" - "-};\n" - "-\n" - " static void submit_bio_wait_endio(struct bio *bio)\n" - " {\n" - "-\tstruct submit_bio_ret *ret = bio->bi_private;\n" - "-\n" - "-\tret->error = blk_status_to_errno(bio->bi_status);\n" - "-\tcomplete(&ret->event);\n" - "+\tcomplete(bio->bi_private);\n" - " }\n" - " \n" - " /**\n" - "@@ -943,16 +935,15 @@ static void submit_bio_wait_endio(struct bio *bio)\n" - " */\n" - " int submit_bio_wait(struct bio *bio)\n" - " {\n" - "-\tstruct submit_bio_ret ret;\n" - "+\tDECLARE_COMPLETION_ONSTACK(done);\n" - " \n" - "-\tinit_completion(&ret.event);\n" - "-\tbio->bi_private = &ret;\n" - "+\tbio->bi_private = &done;\n" - " \tbio->bi_end_io = submit_bio_wait_endio;\n" - " \tbio->bi_opf |= REQ_SYNC;\n" - " \tsubmit_bio(bio);\n" - "-\twait_for_completion_io(&ret.event);\n" - "+\twait_for_completion_io(&done);\n" - " \n" - "-\treturn ret.error;\n" - "+\treturn blk_status_to_errno(bio->bi_status);\n" - " }\n" - " EXPORT_SYMBOL(submit_bio_wait);\n" - " \n" - "-- \n" - 2.14.2 + --- -8ecc67b06f964fdaa2c3cda0e1a1f8a87c8b15c1cb9553fbb86e296af29e8895 +8450c794d94c81a361274b25254ab8e349afb214a727e3ece9de140c10396c18
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.