Subject: [folded-merged] bio-modify-__bio_add_page-to-accept-pages-that-dont-start-a-new-segment-v3.patch removed from -mm tree
To: mlombard@xxxxxxxxxx,axboe@xxxxxxxxx,hch@xxxxxx,kmo@xxxxxxxxxxxxx,viro@xxxxxxxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Mon, 09 Jun 2014 16:07:19 -0700
The patch titled
Subject: bio-modify-__bio_add_page-to-accept-pages-that-dont-start-a-new-segment-v3
has been removed from the -mm tree. Its filename was
bio-modify-__bio_add_page-to-accept-pages-that-dont-start-a-new-segment-v3.patch
This patch was dropped because it was folded into bio-modify-__bio_add_page-to-accept-pages-that-dont-start-a-new-segment.patch
------------------------------------------------------
From: Maurizio Lombardi <mlombard@xxxxxxxxxx>
Subject: bio-modify-__bio_add_page-to-accept-pages-that-dont-start-a-new-segment-v3
Changes in V3:
In case of error, V2 restored the previous number of segments but left
the BIO_SEG_FLAG set.
To avoid problems, after the page is removed from the bio vec,
V3 performs a recount of the segments in the error code path.
Signed-off-by: Maurizio Lombardi <mlombard@xxxxxxxxxx>
Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxx>
Cc: Kent Overstreet <kmo@xxxxxxxxxxxxx>
Cc: Jens Axboe <axboe@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
block/bio.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff -puN block/bio.c~bio-modify-__bio_add_page-to-accept-pages-that-dont-start-a-new-segment-v3 block/bio.c
--- a/block/bio.c~bio-modify-__bio_add_page-to-accept-pages-that-dont-start-a-new-segment-v3
+++ a/block/bio.c
@@ -701,7 +701,6 @@ static int __bio_add_page(struct request
unsigned int max_sectors)
{
int retried_segments = 0;
- unsigned int bi_phys_segments_orig;
struct bio_vec *bvec;
/*
@@ -761,7 +760,6 @@ static int __bio_add_page(struct request
bvec->bv_len = len;
bvec->bv_offset = offset;
bio->bi_vcnt++;
- bi_phys_segments_orig = bio->bi_phys_segments;
bio->bi_phys_segments++;
/*
@@ -812,8 +810,7 @@ static int __bio_add_page(struct request
bvec->bv_len = 0;
bvec->bv_offset = 0;
bio->bi_vcnt--;
- bio->bi_phys_segments = bi_phys_segments_orig;
-
+ blk_recount_segments(q, bio);
return 0;
}
_
Patches currently in -mm which might be from mlombard@xxxxxxxxxx are
origin.patch
linux-next.patch
bio-modify-__bio_add_page-to-accept-pages-that-dont-start-a-new-segment.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
