summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2009-06-29 14:58:45 -0700
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-04-14 18:26:03 -0400
commit05d43865ddc00bdb33d12c8e9d9f176ed5d3797b (patch)
tree8454bdff070ae86179e24c9cf79c3122d1f25680
parent690f1b63b2db88330834d8482f3b125990c8e609 (diff)
downloadop-kernel-dev-05d43865ddc00bdb33d12c8e9d9f176ed5d3797b.zip
op-kernel-dev-05d43865ddc00bdb33d12c8e9d9f176ed5d3797b.tar.gz
xen/blkback: deal with hardsect_size to logical_block_size rename
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
-rw-r--r--drivers/xen/blkback/blkback.c2
-rw-r--r--drivers/xen/blkback/vbd.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/xen/blkback/blkback.c b/drivers/xen/blkback/blkback.c
index 8d988f4..ac5af91 100644
--- 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 7e9a1cd..410c2ea 100644
--- 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,
OpenPOWER on IntegriCloud