[PATCH for-next] block: Fix left-over bi_bdev usage

[PATCH for-next] block: Fix left-over bi_bdev usage

[Keith Busch]

The bi_bdev field was replaced with the gendisk. This patch just fixes
an omission.

Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Keith Busch <keith.busch@intel.com>
---
 block/bio-integrity.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/block/bio-integrity.c b/block/bio-integrity.c
index b4737af..5df3290 100644
--- a/block/bio-integrity.c
+++ b/block/bio-integrity.c
@@ -385,7 +385,7 @@ static void bio_integrity_verify_fn(struct work_struct *work)
  */
 bool __bio_integrity_endio(struct bio *bio)
 {
-	struct blk_integrity *bi = bdev_get_integrity(bio->bi_bdev);
+	struct blk_integrity *bi = blk_get_integrity(bio->bi_disk);
 	struct bio_integrity_payload *bip = bio_integrity(bio);
 
 	if (bio_op(bio) == REQ_OP_READ && !bio->bi_status &&
-- 
2.5.5

Re: [PATCH for-next] block: Fix left-over bi_bdev usage

[Christoph Hellwig]

On Wed, Aug 23, 2017 at 07:45:55PM -0400, Keith Busch wrote:
> The bi_bdev field was replaced with the gendisk. This patch just fixes
> an omission.

Thanks Keith.  I'm pretty sure I fixed exactly this one when
rebasing from my nvme tree to the block tree.  But I guess I didn't
finish the rebase fully, as usual - git rebase considered harmful :)


Acked-by: Christoph Hellwig <hch@lst.de>

Re: [PATCH for-next] block: Fix left-over bi_bdev usage

[Jens Axboe]

On 08/24/2017 02:41 AM, Christoph Hellwig wrote:
> On Wed, Aug 23, 2017 at 07:45:55PM -0400, Keith Busch wrote:
>> The bi_bdev field was replaced with the gendisk. This patch just fixes
>> an omission.
> 
> Thanks Keith.  I'm pretty sure I fixed exactly this one when
> rebasing from my nvme tree to the block tree.  But I guess I didn't
> finish the rebase fully, as usual - git rebase considered harmful :)

Problem is, the issue doesn't exist in my for-4.14/block branch, it
only exists when that is merged with master. I'll apply it to my
for-next branch, even though that one is not persistent, so that
it builds.

-- 
Jens Axboe