From: Ian Campbell Date: Fri, 10 Nov 2006 12:34:26 +0000 (+0000) Subject: PV-on-HVM: Do not enable barriers in blkfront before 2.6.16 X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15567^2~6^2~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=79b9968ae560e39e414e2874c4df06e18ab17ecf;p=xen.git 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 --- diff --git a/linux-2.6-xen-sparse/drivers/xen/blkfront/vbd.c b/linux-2.6-xen-sparse/drivers/xen/blkfront/vbd.c index 7d8e11d1ec..f040a2b7e3 100644 --- a/linux-2.6-xen-sparse/drivers/xen/blkfront/vbd.c +++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/vbd.c @@ -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