There's no reason to defer this until the connect phase, and in fact
there are frontend implementations expecting this to be available
earlier. Move it into the probe function.

Signed-off-by: Jan Beulich <jbeul...@suse.com>
Cc: Bob Liu <bob....@oracle.com>
---
 drivers/block/xen-blkback/xenbus.c |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

--- 4.5-rc3/drivers/block/xen-blkback/xenbus.c
+++ 4.5-rc3-xen-blkback-ind-descr-advertise/drivers/block/xen-blkback/xenbus.c
@@ -618,6 +618,14 @@ static int xen_blkbk_probe(struct xenbus
                goto fail;
        }
 
+       err = xenbus_printf(XBT_NIL, dev->nodename,
+                           "feature-max-indirect-segments", "%u",
+                           MAX_INDIRECT_SEGMENTS);
+       if (err)
+               dev_warn(&dev->dev,
+                        "writing %s/feature-max-indirect-segments (%d)",
+                        dev->nodename, err);
+
        /* Multi-queue: advertise how many queues are supported by us.*/
        err = xenbus_printf(XBT_NIL, dev->nodename,
                            "multi-queue-max-queues", "%u", xenblk_max_queues);
@@ -849,11 +857,6 @@ again:
                                 dev->nodename);
                goto abort;
        }
-       err = xenbus_printf(xbt, dev->nodename, 
"feature-max-indirect-segments", "%u",
-                           MAX_INDIRECT_SEGMENTS);
-       if (err)
-               dev_warn(&dev->dev, "writing %s/feature-max-indirect-segments 
(%d)",
-                        dev->nodename, err);
 
        err = xenbus_printf(xbt, dev->nodename, "sectors", "%llu",
                            (unsigned long long)vbd_sz(&be->blkif->vbd));




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

Reply via email to