# HG changeset patch
# User Alastair Tse <atse@xxxxxxxxxxxxx>
# Node ID 7df5d39a0d9a085bdb050ac721fe3b4ed3b8ebba
# Parent b15168de4d917354f5aba92ba5fb09926ca71889
# Parent 2df2acc057218e734381d8d300c43d7ba1a75d60
Merge
---
linux-2.6-xen-sparse/drivers/xen/blkfront/vbd.c | 9 +++++++++
linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c | 12 ++++++++++--
tools/libfsimage/common/fsimage.c | 2 ++
tools/libfsimage/common/fsimage_grub.c | 1 -
4 files changed, 21 insertions(+), 3 deletions(-)
diff -r b15168de4d91 -r 7df5d39a0d9a
linux-2.6-xen-sparse/drivers/xen/blkfront/vbd.c
--- a/linux-2.6-xen-sparse/drivers/xen/blkfront/vbd.c Fri Nov 10 12:49:22
2006 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/vbd.c Fri Nov 10 12:49:54
2006 +0000
@@ -351,6 +351,7 @@ xlvbd_del(struct blkfront_info *info)
info->rq = NULL;
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
int
xlvbd_barrier(struct blkfront_info *info)
{
@@ -364,3 +365,11 @@ xlvbd_barrier(struct blkfront_info *info
info->gd->disk_name, info->feature_barrier ? "enabled" :
"disabled");
return 0;
}
+#else
+int
+xlvbd_barrier(struct blkfront_info *info)
+{
+ printk("blkfront: %s: barriers disabled\n", info->gd->disk_name);
+ return -ENOSYS;
+}
+#endif
diff -r b15168de4d91 -r 7df5d39a0d9a
linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
--- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c Fri Nov 10
12:49:22 2006 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c Fri Nov 10
12:49:54 2006 +0000
@@ -1623,8 +1623,16 @@ static void xennet_set_features(struct n
if (!(dev->features & NETIF_F_IP_CSUM))
return;
- if (!xennet_set_sg(dev, 1))
- xennet_set_tso(dev, 1);
+ if (xennet_set_sg(dev, 1))
+ return;
+
+ /* Before 2.6.9 TSO seems to be unreliable so do not enable it
+ * on older kernels.
+ */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,9)
+ xennet_set_tso(dev, 1);
+#endif
+
}
static int network_connect(struct net_device *dev)
diff -r b15168de4d91 -r 7df5d39a0d9a tools/libfsimage/common/fsimage.c
--- a/tools/libfsimage/common/fsimage.c Fri Nov 10 12:49:22 2006 +0000
+++ b/tools/libfsimage/common/fsimage.c Fri Nov 10 12:49:54 2006 +0000
@@ -72,6 +72,8 @@ void fsi_close_fsimage(fsi_t *fsi)
void fsi_close_fsimage(fsi_t *fsi)
{
pthread_mutex_lock(&fsi_lock);
+ fsi->f_plugin->fp_ops->fpo_umount(fsi);
+ (void) close(fsi->f_fd);
fsip_fs_free(fsi);
pthread_mutex_unlock(&fsi_lock);
}
diff -r b15168de4d91 -r 7df5d39a0d9a tools/libfsimage/common/fsimage_grub.c
--- a/tools/libfsimage/common/fsimage_grub.c Fri Nov 10 12:49:22 2006 +0000
+++ b/tools/libfsimage/common/fsimage_grub.c Fri Nov 10 12:49:54 2006 +0000
@@ -193,7 +193,6 @@ static int
static int
fsig_umount(fsi_t *fsi)
{
- fsip_fs_free(fsi);
return (0);
}
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home