[Xen-changelog] Clean up xenbus code not to use priorities.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User cl349@xxxxxxxxxxxxxxxxxxxx
# Node ID 69beaae8a1fa2748d66f39bb899e14f5b84a8dd1
# Parent  5f04469075016429efbba7fef18adcc6682885a4
Clean up xenbus code not to use priorities.
Signed-off-by: Rusty Russel <rusty@xxxxxxxxxxxxxxx>
Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>

diff -r 5f0446907501 -r 69beaae8a1fa 
linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c       Tue Jul 26 
17:27:26 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c       Tue Jul 26 
17:38:33 2005
@@ -409,18 +409,14 @@
        return ret;
 }
 
-static int xs_watch(const char *path, const char *token, unsigned int priority)
-{
-       char prio[32];
-       struct kvec iov[3];
-
-       sprintf(prio, "%u", priority);
+static int xs_watch(const char *path, const char *token)
+{
+       struct kvec iov[2];
+
        iov[0].iov_base = (void *)path;
        iov[0].iov_len = strlen(path) + 1;
        iov[1].iov_base = (void *)token;
        iov[1].iov_len = strlen(token) + 1;
-       iov[2].iov_base = prio;
-       iov[2].iov_len = strlen(prio) + 1;
 
        return xs_error(xs_talkv(XS_WATCH, iov, ARRAY_SIZE(iov), NULL));
 }
@@ -479,7 +475,7 @@
        sprintf(token, "%lX", (long)watch);
        BUG_ON(find_watch(token));
 
-       err = xs_watch(watch->node, token, watch->priority);
+       err = xs_watch(watch->node, token);
        if (!err)
                list_add(&watch->list, &watches);
        return err;
diff -r 5f0446907501 -r 69beaae8a1fa 
linux-2.6-xen-sparse/include/asm-xen/xenbus.h
--- a/linux-2.6-xen-sparse/include/asm-xen/xenbus.h     Tue Jul 26 17:27:26 2005
+++ b/linux-2.6-xen-sparse/include/asm-xen/xenbus.h     Tue Jul 26 17:38:33 2005
@@ -109,7 +109,6 @@
 {
        struct list_head list;
        char *node;
-       unsigned int priority;
        void (*callback)(struct xenbus_watch *, const char *node);
 };
 

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