[Xen-changelog] [xen-unstable] PV-on-HVM: Do not enable barriers in blkfront before 2.6.16

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
# Node ID 60a4af3d243fb8c25dc7605287506125b0390a12
# Parent  ac10e3047f3657942f7d3d3bbf2b982de5d17b01
PV-on-HVM: Do not enable barriers in blkfront before 2.6.16

Barrier support was rewritten after 2.6.15. Perhaps it would be
possible to implement support for old kernels as well but for now it
is easier to just disable them.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
---
 linux-2.6-xen-sparse/drivers/xen/blkfront/vbd.c |    9 +++++++++
 1 files changed, 9 insertions(+)

diff -r ac10e3047f36 -r 60a4af3d243f 
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:27:56 
2006 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/vbd.c   Fri Nov 10 12:34:26 
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

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog