Merge tag 'zonefs-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal...

[sfrench/cifs-2.6.git] / drivers / block / xen-blkback / blkback.c

diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c
index 4defd7f387c786b937b445e3f7b8615fc733075c..944576d582fb14145e64822118aaebfc0df343fe 100644 (file)
--- a/drivers/block/xen-blkback/blkback.c
+++ b/drivers/block/xen-blkback/blkback.c
@@ -465,7 +465,7 @@ static int xen_vbd_translate(struct phys_req *req, struct xen_blkif *blkif,
        }
 
        req->dev  = vbd->pdevice;
-       req->bdev = vbd->bdev_handle->bdev;
+       req->bdev = file_bdev(vbd->bdev_file);
        rc = 0;
 
  out:
@@ -969,7 +969,7 @@ static int dispatch_discard_io(struct xen_blkif_ring *ring,
        int err = 0;
        int status = BLKIF_RSP_OKAY;
        struct xen_blkif *blkif = ring->blkif;
-       struct block_device *bdev = blkif->vbd.bdev_handle->bdev;
+       struct block_device *bdev = file_bdev(blkif->vbd.bdev_file);
        struct phys_req preq;
 
        xen_blkif_get(blkif);