xen-blkback-porting

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/xen/blkback/xenbus.c b/drivers/xen/blkback/xenbus.c
index 80d9aa6e6ba3..650f4b3e9b3c 100644
--- a/drivers/xen/blkback/xenbus.c
+++ b/drivers/xen/blkback/xenbus.c
@@ -238,8 +238,8 @@ static int blkback_probe(struct xenbus_device *dev,
         /* setup back pointer */
         be->blkif->be = be;
 
-        err = xenbus_watch_path2(dev, dev->nodename, "physical-device",
-                                 &be->backend_watch, backend_changed);
+        err = xenbus_watch_pathfmt(dev, &be->backend_watch, backend_changed,
+                                   "%s/%s", dev->nodename, "physical-device");
         if (err)
                 goto fail;
 
@@ -537,5 +537,6 @@ static struct xenbus_driver blkback = {
 
 void blkif_xenbus_init(void)
 {
-        xenbus_register_backend(&blkback);
+        /* XXX must_check */
+        (void)xenbus_register_backend(&blkback);
 }