summaryrefslogtreecommitdiff
path: root/drivers/block/xen-blkback/xenbus.c
diff options
context:
space:
mode:
authorRoger Pau Monne <roger.pau@citrix.com>2012-11-02 15:43:04 (GMT)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2012-11-04 15:35:40 (GMT)
commitcb5bd4d19b46c220b1ac8462a3da01767dd99488 (patch)
tree1b22151771a90480d0d4790521b9432f46f1e32a /drivers/block/xen-blkback/xenbus.c
parent0a8704a51f386cab7394e38ff1d66eef924d8ab8 (diff)
downloadlinux-fsl-qoriq-cb5bd4d19b46c220b1ac8462a3da01767dd99488.tar.xz
xen/blkback: persistent-grants fixes
This patch contains fixes for persistent grants implementation v2: * handle == 0 is a valid handle, so initialize grants in blkback setting the handle to BLKBACK_INVALID_HANDLE instead of 0. Reported by Konrad Rzeszutek Wilk. * new_map is a boolean, use "true" or "false" instead of 1 and 0. Reported by Konrad Rzeszutek Wilk. * blkfront announces the persistent-grants feature as feature-persistent-grants, use feature-persistent instead which is consistent with blkback and the public Xen headers. * Add a consistency check in blkfront to make sure we don't try to access segments that have not been set. Reported-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Signed-off-by: Roger Pau Monne <roger.pau@citrix.com> [v1: The new_map int->bool had already been changed] Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'drivers/block/xen-blkback/xenbus.c')
-rw-r--r--drivers/block/xen-blkback/xenbus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c
index b225026..a03ecbb 100644
--- a/drivers/block/xen-blkback/xenbus.c
+++ b/drivers/block/xen-blkback/xenbus.c
@@ -760,7 +760,7 @@ static int connect_ring(struct backend_info *be)
return -1;
}
err = xenbus_gather(XBT_NIL, dev->otherend,
- "feature-persistent-grants", "%u",
+ "feature-persistent", "%u",
&pers_grants, NULL);
if (err)
pers_grants = 0;