From 6f2b9e2f7f7edc5514522d18aca3ed3d2b62a5f8 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Date: Thu, 18 Mar 2010 15:35:05 -0700
Subject: [PATCH] --- yaml --- r: 251210 b: refs/heads/master c:
 98e036a356747cfaa225478b1e4875e190257b09 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/xen/blkback/common.h | 2 ++
 trunk/drivers/xen/blkback/vbd.c    | 2 +-
 trunk/drivers/xen/blkback/xenbus.c | 5 +++++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2be29bee9f17..bfae13d98146 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ccbfe26c106a1a93a402567b7853c1484c4a0b0
+refs/heads/master: 98e036a356747cfaa225478b1e4875e190257b09
diff --git a/trunk/drivers/xen/blkback/common.h b/trunk/drivers/xen/blkback/common.h
index cebcc2b7e9f6..0f91830f18c8 100644
--- a/trunk/drivers/xen/blkback/common.h
+++ b/trunk/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/trunk/drivers/xen/blkback/vbd.c b/trunk/drivers/xen/blkback/vbd.c
index 0635c54079f8..943ec2313522 100644
--- a/trunk/drivers/xen/blkback/vbd.c
+++ b/trunk/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/trunk/drivers/xen/blkback/xenbus.c b/trunk/drivers/xen/blkback/xenbus.c
index 34f8e4046578..c31e5c40b45c 100644
--- a/trunk/drivers/xen/blkback/xenbus.c
+++ b/trunk/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;