diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2014-06-24 16:04:43 +0200 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-06-27 10:25:09 +0200 |
| commit | 63a97385b3919335ff2a1d502925de4dc3ef4fd4 (patch) | |
| tree | c830a724a9ef51fa89d29e9710e0ce4b6f25e43e | |
| parent | 61844d8e25eb8899b0836afa9796fa239db80f1f (diff) | |
Revert "bio-integrity: Fix bio_integrity_verify segment start bug"
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 <martin.petersen@oracle.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | fs/bio-integrity.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/bio-integrity.c b/fs/bio-integrity.c index b5ee393e2e8..76273c1d26a 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; |