From 471340892b385c05a66905141e42ae2764497f9a Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Tue, 3 May 2011 12:04:52 -0400 Subject: [PATCH] --- yaml --- r: 251193 b: refs/heads/master c: 4352b47ab7918108b389a48d2163c9a4c2aaf139 h: refs/heads/master i: 251191: 02ca01e700467f2db81094079e5cc46e3970deba v: v3 --- [refs] | 2 +- trunk/drivers/block/xen-blkfront.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fbf64317b0eb..f73d44c22d35 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: edc83d47a9928281ecf6fb709753edb3c58ae7f1 +refs/heads/master: 4352b47ab7918108b389a48d2163c9a4c2aaf139 diff --git a/trunk/drivers/block/xen-blkfront.c b/trunk/drivers/block/xen-blkfront.c index 9cb8668ff5f4..20759817ad57 100644 --- a/trunk/drivers/block/xen-blkfront.c +++ b/trunk/drivers/block/xen-blkfront.c @@ -1141,7 +1141,7 @@ static void blkfront_connect(struct blkfront_info *info) } err = xenbus_gather(XBT_NIL, info->xbdev->otherend, - "feature-barrier", "%lu", &barrier, + "feature-barrier", "%d", &barrier, NULL); /*