direct-io.hg

changeset 8001:9ee811544c40

Merged.
author emellor@leeni.uk.xensource.com
date Wed Nov 23 19:31:22 2005 +0000 (2005-11-23)
parents b8bca5421d5c
children 8451c6567123
files linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c tools/examples/block tools/examples/block-common.sh tools/examples/block-enbd tools/examples/block-nbd
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Wed Nov 23 19:31:14 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Wed Nov 23 19:31:22 2005 +0000
     1.3 @@ -155,6 +155,8 @@ struct netfront_info
     1.4  	   (_list)[0]  = (_list)[_id];				\
     1.5  	   (unsigned short)_id; })
     1.6  
     1.7 +#define DEBUG 1
     1.8 +
     1.9  #ifdef DEBUG
    1.10  static char *be_state_name[] = {
    1.11  	[BEST_CLOSED]       = "closed",
    1.12 @@ -900,7 +902,7 @@ static int network_close(struct net_devi
    1.13  {
    1.14  	struct netfront_info *np = netdev_priv(dev);
    1.15  	np->user_state = UST_CLOSED;
    1.16 -	netif_stop_queue(np->netdev);
    1.17 +	netif_stop_queue(dev);
    1.18  	return 0;
    1.19  }
    1.20  
    1.21 @@ -1164,8 +1166,6 @@ static void netfront_closing(struct xenb
    1.22  
    1.23  	DPRINTK("netfront_closing: %s removed\n", dev->nodename);
    1.24  
    1.25 -	close_netdev(info);
    1.26 -
    1.27  	xenbus_switch_state(dev, NULL, XenbusStateClosed);
    1.28  }
    1.29  
     2.1 --- a/tools/examples/block	Wed Nov 23 19:31:14 2005 +0000
     2.2 +++ b/tools/examples/block	Wed Nov 23 19:31:22 2005 +0000
     2.3 @@ -3,12 +3,6 @@
     2.4  dir=$(dirname "$0")
     2.5  . "$dir/block-common.sh"
     2.6  
     2.7 -case "$command" in
     2.8 -    online | offline)
     2.9 -        exit 0
    2.10 -        ;;
    2.11 -esac
    2.12 -
    2.13  expand_dev() {
    2.14    local dev
    2.15    case $1 in
     3.1 --- a/tools/examples/block-common.sh	Wed Nov 23 19:31:14 2005 +0000
     3.2 +++ b/tools/examples/block-common.sh	Wed Nov 23 19:31:22 2005 +0000
     3.3 @@ -21,9 +21,7 @@ dir=$(dirname "$0")
     3.4  
     3.5  findCommand "$@"
     3.6  
     3.7 -if [ "$command" != "online" ]  &&
     3.8 -   [ "$command" != "offline" ] &&
     3.9 -   [ "$command" != "add" ]     &&
    3.10 +if [ "$command" != "add" ] &&
    3.11     [ "$command" != "remove" ]
    3.12  then
    3.13    log err "Invalid command: $command"
     4.1 --- a/tools/examples/block-enbd	Wed Nov 23 19:31:14 2005 +0000
     4.2 +++ b/tools/examples/block-enbd	Wed Nov 23 19:31:22 2005 +0000
     4.3 @@ -11,7 +11,7 @@ dir=$(dirname "$0")
     4.4  . "$dir/block-common.sh"
     4.5  
     4.6  case "$command" in
     4.7 -  bind)
     4.8 +  add)
     4.9      for dev in /dev/nd*; do
    4.10        if nbd-client $2:$3 $dev; then
    4.11          write_dev $dev
    4.12 @@ -20,7 +20,7 @@ case "$command" in
    4.13      done
    4.14      exit 1
    4.15      ;;
    4.16 -  unbind)
    4.17 +  remove)
    4.18      nbd-client -d $2
    4.19      exit 0
    4.20      ;;
     5.1 --- a/tools/examples/block-nbd	Wed Nov 23 19:31:14 2005 +0000
     5.2 +++ b/tools/examples/block-nbd	Wed Nov 23 19:31:22 2005 +0000
     5.3 @@ -11,7 +11,7 @@ dir=$(dirname "$0")
     5.4  . "$dir/block-common.sh"
     5.5  
     5.6  case "$command" in
     5.7 -  bind)
     5.8 +  add)
     5.9      for dev in /dev/nbd*; do
    5.10        if nbd-client $2 $3 $dev; then
    5.11          write_dev $dev
    5.12 @@ -20,7 +20,7 @@ case "$command" in
    5.13      done
    5.14      exit 1
    5.15      ;;
    5.16 -  unbind)
    5.17 +  remove)
    5.18      nbd-client -d $2
    5.19      exit 0
    5.20      ;;