3.12-stable review patch. If anyone has any objections, please let me know.
=============== This reverts commit 7cbcb219e4113e10ce4b036118992abdbc4a8273, misapplied upstream commit 5837c80e870bc3b12ac6a98cdc9ce7a9522a8fb6. The upstream commit was applied twice to stable-3.12, the second time to bio_integrity_generate. Revert this second application. Cc: Martin K. Petersen <[email protected]> Cc: Jens Axboe <[email protected]> Cc: Christoph Hellwig <[email protected]> Signed-off-by: Nicholas Bellinger <[email protected]> Signed-off-by: Jens Axboe <[email protected]> Signed-off-by: Jiri Slaby <[email protected]> --- fs/bio-integrity.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/bio-integrity.c b/fs/bio-integrity.c index b5ee393e2e8d..76273c1d26a6 100644 --- a/fs/bio-integrity.c +++ b/fs/bio-integrity.c @@ -316,7 +316,7 @@ static void bio_integrity_generate(struct bio *bio) bix.disk_name = bio->bi_bdev->bd_disk->disk_name; bix.sector_size = bi->sector_size; - bio_for_each_segment_all(bv, bio, i) { + bio_for_each_segment(bv, bio, i) { void *kaddr = kmap_atomic(bv->bv_page); bix.data_buf = kaddr + bv->bv_offset; bix.data_size = bv->bv_len; -- 2.0.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
