ia64/linux-2.6.18-xen.hg

changeset 586:88e01408ec0d

xenbus-dev watches: Actually add the extra data to the watch event
instead of adding the token twice.

Signed-off-by: Christian Limpach <Christian.Limpach@citrix.com>
author Ian Campbell <ian.campbell@citrix.com>
date Thu Jul 03 09:17:36 2008 +0100 (2008-07-03)
parents 6794141e7418
children 999b88699ca4
files drivers/xen/xenbus/xenbus_dev.c
line diff
     1.1 --- a/drivers/xen/xenbus/xenbus_dev.c	Wed Jul 02 20:53:00 2008 +0100
     1.2 +++ b/drivers/xen/xenbus/xenbus_dev.c	Thu Jul 03 09:17:36 2008 +0100
     1.3 @@ -188,7 +188,7 @@ static void watch_fired(struct xenbus_wa
     1.4  	queue_reply(adap->dev_data, (char *)path, path_len);
     1.5  	queue_reply(adap->dev_data, (char *)token, tok_len);
     1.6  	if (len > 2)
     1.7 -		queue_reply(adap->dev_data, (char *)token, data_len);
     1.8 +		queue_reply(adap->dev_data, (char *)vec[2], data_len);
     1.9  	mutex_unlock(&adap->dev_data->reply_mutex);
    1.10  }
    1.11