summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorJuergen Gross <jgross@suse.com>2017-02-09 08:39:57 -0500
committerBoris Ostrovsky <boris.ostrovsky@oracle.com>2017-02-09 11:26:49 -0500
commit5584ea250ae44f929feb4c7bd3877d1c5edbf813 (patch)
treed84dca574c46ec785098d13211d92ef74e3a74f2 /drivers/block
parent332f791dc98d98116f4473b726f67c9321b0f31e (diff)
xen: modify xenstore watch event interface
Today a Xenstore watch event is delivered via a callback function declared as: void (*callback)(struct xenbus_watch *, const char **vec, unsigned int len); As all watch events only ever come with two parameters (path and token) changing the prototype to: void (*callback)(struct xenbus_watch *, const char *path, const char *token); is the natural thing to do. Apply this change and adapt all users. Cc: konrad.wilk@oracle.com Cc: roger.pau@citrix.com Cc: wei.liu2@citrix.com Cc: paul.durrant@citrix.com Cc: netdev@vger.kernel.org Signed-off-by: Juergen Gross <jgross@suse.com> Reviewed-by: Paul Durrant <paul.durrant@citrix.com> Reviewed-by: Wei Liu <wei.liu2@citrix.com> Reviewed-by: Roger Pau Monné <roger.pau@citrix.com> Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/xen-blkback/xenbus.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c
index 415e79b69d34..8fe61b5dc5a6 100644
--- a/drivers/block/xen-blkback/xenbus.c
+++ b/drivers/block/xen-blkback/xenbus.c
@@ -38,8 +38,8 @@ struct backend_info {
38static struct kmem_cache *xen_blkif_cachep; 38static struct kmem_cache *xen_blkif_cachep;
39static void connect(struct backend_info *); 39static void connect(struct backend_info *);
40static int connect_ring(struct backend_info *); 40static int connect_ring(struct backend_info *);
41static void backend_changed(struct xenbus_watch *, const char **, 41static void backend_changed(struct xenbus_watch *, const char *,
42 unsigned int); 42 const char *);
43static void xen_blkif_free(struct xen_blkif *blkif); 43static void xen_blkif_free(struct xen_blkif *blkif);
44static void xen_vbd_free(struct xen_vbd *vbd); 44static void xen_vbd_free(struct xen_vbd *vbd);
45 45
@@ -661,7 +661,7 @@ fail:
661 * ready, connect. 661 * ready, connect.
662 */ 662 */
663static void backend_changed(struct xenbus_watch *watch, 663static void backend_changed(struct xenbus_watch *watch,
664 const char **vec, unsigned int len) 664 const char *path, const char *token)
665{ 665{
666 int err; 666 int err;
667 unsigned major; 667 unsigned major;