buildfix for xenblk

buildfix for xenblk

[Conny Seidel]

[-- Attachment #1.1.1: Type: text/plain, Size: 474 bytes --]

Hi,

the c/s 1005 (commit f7f420bd7b7a) in linux-2.6.18-xen.hg doesn't build.
This patch fixed the build for us.


Conny

##
##################################################################
# Position   : Systems Design Technician @ OSRC                  #
# Email      : conny.seidel@amd.com  GnuPG-Key: 0xA6AB055D       #
# Fingerprint: 17C4 5DB2 7C4C C1C7 1452 8148 F139 7C09 A6AB 055D #
##################################################################

[-- Attachment #1.1.2: xenblk_build.fix --]
[-- Type: text/plain, Size: 1304 bytes --]

Signed-off-by: Conny Seidel <conny.seidel@amd.com>

diff -r f7f420bd7b7a drivers/xen/blkback/common.h
--- a/drivers/xen/blkback/common.h      Mon Mar 15 13:31:19 2010 +0000
+++ b/drivers/xen/blkback/common.h      Mon Mar 15 17:15:56 2010 +0100
@@ -50,6 +50,16 @@
        pr_debug("(file=%s, line=%d) " _f,      \
                 __FILE__ , __LINE__ , ## _a )

+struct backend_info
+{
+        struct xenbus_device *dev;
+        blkif_t *blkif;
+        struct xenbus_watch backend_watch;
+        unsigned major;
+        unsigned minor;
+        char *mode;
+};
+
 struct vbd {
        blkif_vdev_t   handle;      /* what the domain refers to this
vbd as */ unsigned char  readonly;    /* Non-zero -> read-only */
diff -r f7f420bd7b7a drivers/xen/blkback/xenbus.c
--- a/drivers/xen/blkback/xenbus.c      Mon Mar 15 13:31:19 2010 +0000
+++ b/drivers/xen/blkback/xenbus.c      Mon Mar 15 17:15:56 2010 +0100
@@ -29,15 +29,6 @@

 static DEFINE_RWLOCK(sysfs_read_lock);

-struct backend_info
-{
-       struct xenbus_device *dev;
-       blkif_t *blkif;
-       struct xenbus_watch backend_watch;
-       unsigned major;
-       unsigned minor;
-       char *mode;
-};

 static void connect(struct backend_info *);
 static int connect_ring(struct backend_info *);

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

[-- Attachment #2: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

Re: buildfix for xenblk

[Conny Seidel]

[-- Attachment #1.1.1: Type: text/plain, Size: 508 bytes --]

On Mon, 15 Mar 2010 17:31:04 +0100
Conny Seidel <conny.seidel@amd.com> wrote:

I'm sorry I messed the previous patch up. Here is the corrected diff.

Conny

##
##################################################################
# Position   : Systems Design Technician @ OSRC                  #
# Email      : conny.seidel@amd.com  GnuPG-Key: 0xA6AB055D       #
# Fingerprint: 17C4 5DB2 7C4C C1C7 1452 8148 F139 7C09 A6AB 055D #
##################################################################

[-- Attachment #1.1.2: xenblk_build.fix --]
[-- Type: text/plain, Size: 1290 bytes --]

Signed-off-by: Conny Seidel <conny.seidel@amd.com>

diff -r f7f420bd7b7a drivers/xen/blkback/common.h
--- a/drivers/xen/blkback/common.h      Mon Mar 15 13:31:19 2010 +0000
+++ b/drivers/xen/blkback/common.h      Mon Mar 15 17:34:39 2010 +0100
@@ -114,6 +114,17 @@
                        wake_up(&(_b)->waiting_to_free);\
        } while (0)

+struct backend_info
+{
+        struct xenbus_device *dev;
+        blkif_t *blkif;
+        struct xenbus_watch backend_watch;
+        unsigned major;
+        unsigned minor;
+        char *mode;
+};
+
+
 /* Create a vbd. */
 int vbd_create(blkif_t *blkif, blkif_vdev_t vdevice, unsigned major,
               unsigned minor, int readonly, int cdrom);
diff -r f7f420bd7b7a drivers/xen/blkback/xenbus.c
--- a/drivers/xen/blkback/xenbus.c      Mon Mar 15 13:31:19 2010 +0000
+++ b/drivers/xen/blkback/xenbus.c      Mon Mar 15 17:34:39 2010 +0100
@@ -29,15 +29,6 @@

 static DEFINE_RWLOCK(sysfs_read_lock);

-struct backend_info
-{
-       struct xenbus_device *dev;
-       blkif_t *blkif;
-       struct xenbus_watch backend_watch;
-       unsigned major;
-       unsigned minor;
-       char *mode;
-};

 static void connect(struct backend_info *);
 static int connect_ring(struct backend_info *);


[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

[-- Attachment #2: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel