ia64/xen-unstable

changeset 12372:7df5d39a0d9a

Merge
author Alastair Tse <atse@xensource.com>
date Fri Nov 10 12:49:54 2006 +0000 (2006-11-10)
parents b15168de4d91 2df2acc05721
children f5b98471d6ff
files
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkfront/vbd.c	Fri Nov 10 12:49:22 2006 +0000
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/vbd.c	Fri Nov 10 12:49:54 2006 +0000
     1.3 @@ -351,6 +351,7 @@ xlvbd_del(struct blkfront_info *info)
     1.4  	info->rq = NULL;
     1.5  }
     1.6  
     1.7 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
     1.8  int
     1.9  xlvbd_barrier(struct blkfront_info *info)
    1.10  {
    1.11 @@ -364,3 +365,11 @@ xlvbd_barrier(struct blkfront_info *info
    1.12  	       info->gd->disk_name, info->feature_barrier ? "enabled" : "disabled");
    1.13  	return 0;
    1.14  }
    1.15 +#else
    1.16 +int
    1.17 +xlvbd_barrier(struct blkfront_info *info)
    1.18 +{
    1.19 +	printk("blkfront: %s: barriers disabled\n", info->gd->disk_name);
    1.20 +	return -ENOSYS;
    1.21 +}
    1.22 +#endif
     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Fri Nov 10 12:49:22 2006 +0000
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Fri Nov 10 12:49:54 2006 +0000
     2.3 @@ -1623,8 +1623,16 @@ static void xennet_set_features(struct n
     2.4  	if (!(dev->features & NETIF_F_IP_CSUM))
     2.5  		return;
     2.6  
     2.7 -	if (!xennet_set_sg(dev, 1))
     2.8 -		xennet_set_tso(dev, 1);
     2.9 +	if (xennet_set_sg(dev, 1))
    2.10 +		return;
    2.11 +
    2.12 +	/* Before 2.6.9 TSO seems to be unreliable so do not enable it
    2.13 +	 * on older kernels.
    2.14 +	 */
    2.15 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,9)
    2.16 +	xennet_set_tso(dev, 1);
    2.17 +#endif
    2.18 +
    2.19  }
    2.20  
    2.21  static int network_connect(struct net_device *dev)
     3.1 --- a/tools/libfsimage/common/fsimage.c	Fri Nov 10 12:49:22 2006 +0000
     3.2 +++ b/tools/libfsimage/common/fsimage.c	Fri Nov 10 12:49:54 2006 +0000
     3.3 @@ -72,6 +72,8 @@ fail:
     3.4  void fsi_close_fsimage(fsi_t *fsi)
     3.5  {
     3.6  	pthread_mutex_lock(&fsi_lock);
     3.7 +        fsi->f_plugin->fp_ops->fpo_umount(fsi);
     3.8 +        (void) close(fsi->f_fd);
     3.9  	fsip_fs_free(fsi);
    3.10  	pthread_mutex_unlock(&fsi_lock);
    3.11  }
     4.1 --- a/tools/libfsimage/common/fsimage_grub.c	Fri Nov 10 12:49:22 2006 +0000
     4.2 +++ b/tools/libfsimage/common/fsimage_grub.c	Fri Nov 10 12:49:54 2006 +0000
     4.3 @@ -193,7 +193,6 @@ fsig_mount(fsi_t *fsi, const char *path)
     4.4  static int
     4.5  fsig_umount(fsi_t *fsi)
     4.6  {
     4.7 -	fsip_fs_free(fsi);
     4.8  	return (0);
     4.9  }
    4.10