xen/blkback: add accessor for xenbus backend device

Since backend_info is hidden away now.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>

diff --git a/drivers/xen/blkback/common.h b/drivers/xen/blkback/common.h
index cebcc2b7e9f63a46f21882b7665106b0c36f488e..0f91830f18c827ebdb94fac2cf2274d8223ed4a0 100644 (file)
--- a/drivers/xen/blkback/common.h
+++ b/drivers/xen/blkback/common.h
@@ -136,4 +136,6 @@ int blkif_schedule(void *arg);
 int blkback_barrier(struct xenbus_transaction xbt,
                    struct backend_info *be, int state);
 
+struct xenbus_device *blkback_xenbus(struct backend_info *be);
+
 #endif /* __BLKIF__BACKEND__COMMON_H__ */

diff --git a/drivers/xen/blkback/vbd.c b/drivers/xen/blkback/vbd.c
index 0635c54079f84a9fbce43647f5c64617fb9a79e0..943ec231352277884675600b6186569bf7dfacb0 100644 (file)
--- a/drivers/xen/blkback/vbd.c
+++ b/drivers/xen/blkback/vbd.c
@@ -123,7 +123,7 @@ void vbd_resize(blkif_t *blkif)
        struct vbd *vbd = &blkif->vbd;
        struct xenbus_transaction xbt;
        int err;
-       struct xenbus_device *dev = blkif->be->dev;
+       struct xenbus_device *dev = blkback_xenbus(blkif->be);
        unsigned long long new_size = vbd_size(vbd);
 
        printk(KERN_INFO "VBD Resize: new size %Lu\n", new_size);

diff --git a/drivers/xen/blkback/xenbus.c b/drivers/xen/blkback/xenbus.c
index 34f8e4046578f8ddc0d725da8ba054f19c0b627c..c31e5c40b45c5db4c9f84c58f2d9e363b6302371 100644 (file)
--- a/drivers/xen/blkback/xenbus.c
+++ b/drivers/xen/blkback/xenbus.c
@@ -42,6 +42,11 @@ static int connect_ring(struct backend_info *);
 static void backend_changed(struct xenbus_watch *, const char **,
                            unsigned int);
 
+struct xenbus_device *blkback_xenbus(struct backend_info *be)
+{
+       return be->dev;
+}
+
 static int blkback_name(blkif_t *blkif, char *buf)
 {
        char *devpath, *devname;