From 2a80a930457f6459df76c95e6b7a282514082aa4 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Mon, 29 Jun 2009 14:58:45 -0700 Subject: [PATCH] --- yaml --- r: 251203 b: refs/heads/master c: 05d43865ddc00bdb33d12c8e9d9f176ed5d3797b h: refs/heads/master i: 251201: 502c00d4e070079fd44a340fd1e7effde24849b6 251199: 65917021ff469ee790c7e153c8f865d4425af146 v: v3 --- [refs] | 2 +- trunk/drivers/xen/blkback/blkback.c | 2 +- trunk/drivers/xen/blkback/vbd.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 47fced19648f..31de3d729388 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 690f1b63b2db88330834d8482f3b125990c8e609 +refs/heads/master: 05d43865ddc00bdb33d12c8e9d9f176ed5d3797b diff --git a/trunk/drivers/xen/blkback/blkback.c b/trunk/drivers/xen/blkback/blkback.c index 8d988f4513aa..ac5af91c393f 100644 --- a/trunk/drivers/xen/blkback/blkback.c +++ b/trunk/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/trunk/drivers/xen/blkback/vbd.c b/trunk/drivers/xen/blkback/vbd.c index 7e9a1cd35ade..410c2eac5ad7 100644 --- a/trunk/drivers/xen/blkback/vbd.c +++ b/trunk/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,