[Xen-changelog] [linux-2.6.18-xen] blkback: failure to write "feature-barrier" node is non-fatal

[Xen patchbot-linux-2.6.18-xen <patchbot@xxxxxxx>]

# HG changeset patch
# User Jan Beulich <jbeulich@xxxxxxxx>
# Date 1331815135 -3600
# Node ID 484947c99e63975cd812738ff02b0d237fc45095
# Parent  e0596f39eaefb9962a934aae45e1fffabb925e78
blkback: failure to write "feature-barrier" node is non-fatal

This is an extension, and whether its presence is a requirement should
be decided by the frontend.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
---


diff -r e0596f39eaef -r 484947c99e63 drivers/xen/blkback/common.h
--- a/drivers/xen/blkback/common.h      Mon Mar 12 12:28:56 2012 +0100
+++ b/drivers/xen/blkback/common.h      Thu Mar 15 13:38:55 2012 +0100
@@ -138,7 +138,7 @@
 irqreturn_t blkif_be_int(int irq, void *dev_id, struct pt_regs *regs);
 int blkif_schedule(void *arg);
 
-int blkback_barrier(struct xenbus_transaction xbt,
-                   struct backend_info *be, int state);
+void blkback_barrier(struct xenbus_transaction, struct backend_info *,
+                    int state);
 
 #endif /* __BLKIF__BACKEND__COMMON_H__ */
diff -r e0596f39eaef -r 484947c99e63 drivers/xen/blkback/xenbus.c
--- a/drivers/xen/blkback/xenbus.c      Mon Mar 12 12:28:56 2012 +0100
+++ b/drivers/xen/blkback/xenbus.c      Thu Mar 15 13:38:55 2012 +0100
@@ -204,18 +204,15 @@
        return 0;
 }
 
-int blkback_barrier(struct xenbus_transaction xbt,
-                   struct backend_info *be, int state)
+void blkback_barrier(struct xenbus_transaction xbt,
+                    struct backend_info *be, int state)
 {
        struct xenbus_device *dev = be->dev;
-       int err;
+       int err = xenbus_printf(xbt, dev->nodename, "feature-barrier",
+                               "%d", state);
 
-       err = xenbus_printf(xbt, dev->nodename, "feature-barrier",
-                           "%d", state);
        if (err)
-               xenbus_dev_fatal(dev, err, "writing feature-barrier");
-
-       return err;
+               xenbus_dev_error(dev, err, "writing feature-barrier");
 }
 
 /**
@@ -435,9 +432,7 @@
                return;
        }
 
-       err = blkback_barrier(xbt, be, 1);
-       if (err)
-               goto abort;
+       blkback_barrier(xbt, be, 1);
 
        err = xenbus_printf(xbt, dev->nodename, "sectors", "%llu",
                            vbd_size(&be->blkif->vbd));

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