ia64/xen-unstable

changeset 5892:69beaae8a1fa

Clean up xenbus code not to use priorities.
Signed-off-by: Rusty Russel <rusty@rustcorp.com.au>
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
author cl349@firebug.cl.cam.ac.uk
date Tue Jul 26 17:38:33 2005 +0000 (2005-07-26)
parents 5f0446907501
children 2333f6616d18
files linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c linux-2.6-xen-sparse/include/asm-xen/xenbus.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c	Tue Jul 26 17:27:26 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c	Tue Jul 26 17:38:33 2005 +0000
     1.3 @@ -409,18 +409,14 @@ int xenbus_gather(const char *dir, ...)
     1.4  	return ret;
     1.5  }
     1.6  
     1.7 -static int xs_watch(const char *path, const char *token, unsigned int priority)
     1.8 +static int xs_watch(const char *path, const char *token)
     1.9  {
    1.10 -	char prio[32];
    1.11 -	struct kvec iov[3];
    1.12 +	struct kvec iov[2];
    1.13  
    1.14 -	sprintf(prio, "%u", priority);
    1.15  	iov[0].iov_base = (void *)path;
    1.16  	iov[0].iov_len = strlen(path) + 1;
    1.17  	iov[1].iov_base = (void *)token;
    1.18  	iov[1].iov_len = strlen(token) + 1;
    1.19 -	iov[2].iov_base = prio;
    1.20 -	iov[2].iov_len = strlen(prio) + 1;
    1.21  
    1.22  	return xs_error(xs_talkv(XS_WATCH, iov, ARRAY_SIZE(iov), NULL));
    1.23  }
    1.24 @@ -479,7 +475,7 @@ int register_xenbus_watch(struct xenbus_
    1.25  	sprintf(token, "%lX", (long)watch);
    1.26  	BUG_ON(find_watch(token));
    1.27  
    1.28 -	err = xs_watch(watch->node, token, watch->priority);
    1.29 +	err = xs_watch(watch->node, token);
    1.30  	if (!err)
    1.31  		list_add(&watch->list, &watches);
    1.32  	return err;
     2.1 --- a/linux-2.6-xen-sparse/include/asm-xen/xenbus.h	Tue Jul 26 17:27:26 2005 +0000
     2.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/xenbus.h	Tue Jul 26 17:38:33 2005 +0000
     2.3 @@ -109,7 +109,6 @@ struct xenbus_watch
     2.4  {
     2.5  	struct list_head list;
     2.6  	char *node;
     2.7 -	unsigned int priority;
     2.8  	void (*callback)(struct xenbus_watch *, const char *node);
     2.9  };
    2.10