xen/blkback: deal with hardsect_size to logical_block_size rename

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>

diff --git a/drivers/xen/blkback/blkback.c b/drivers/xen/blkback/blkback.c
index 8d988f4513aaa3aa674202d2eada9475d3ef2b91..ac5af91c393fb1e926dd7964513d4336d1e43074 100644 (file)
--- a/drivers/xen/blkback/blkback.c
+++ b/drivers/xen/blkback/blkback.c
@@ -484,7 +484,7 @@ static void dispatch_rw_block_io(blkif_t *blkif,
 
        for (i = 0; i < nseg; i++) {
                if (((int)preq.sector_number|(int)seg[i].nsec) &
-                   ((bdev_hardsect_size(preq.bdev) >> 9) - 1)) {
+                   ((bdev_logical_block_size(preq.bdev) >> 9) - 1)) {
                        DPRINTK("Misaligned I/O request from domain %d",
                                blkif->domid);
                        goto fail_put_bio;

diff --git a/drivers/xen/blkback/vbd.c b/drivers/xen/blkback/vbd.c
index 7e9a1cd35adef462dd33ed7be8a70d6e81aeebfc..410c2eac5ad7f819c2ab7c8762523914f1693eb5 100644 (file)
--- a/drivers/xen/blkback/vbd.c
+++ b/drivers/xen/blkback/vbd.c
@@ -47,7 +47,7 @@ unsigned int vbd_info(struct vbd *vbd)
 
 unsigned long vbd_secsize(struct vbd *vbd)
 {
-       return bdev_hardsect_size(vbd->bdev);
+       return bdev_logical_block_size(vbd->bdev);
 }
 
 int vbd_create(blkif_t *blkif, blkif_vdev_t handle, unsigned major,