blktap: Remove obsolete kernel version dependencies.
Signed-off-by: Daniel Stodden <daniel.stodden@xxxxxxxxxx>
diff -r 6a74cabb7220 -r 699e1fad7561 drivers/xen/blktap/device.c
--- a/drivers/xen/blktap/device.c Wed Jun 02 19:45:25 2010 -0700
+++ b/drivers/xen/blktap/device.c Wed Jun 02 19:45:25 2010 -0700
@@ -97,26 +97,6 @@
command, (long)argument, inode->i_rdev);
switch (command) {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
- case HDIO_GETGEO: {
- struct hd_geometry geo;
- int ret;
-
- if (!argument)
- return -EINVAL;
-
- geo.start = get_start_sect(bd);
- ret = blktap_device_getgeo(bd, &geo);
- if (ret)
- return ret;
-
- if (copy_to_user((struct hd_geometry __user *)argument, &geo,
- sizeof(geo)))
- return -EFAULT;
-
- return 0;
- }
-#endif
case CDROMMULTISESSION:
BTDBG("FIXME: support multisession CDs later\n");
for (i = 0; i < sizeof(struct cdrom_multisession); i++)
@@ -149,9 +129,7 @@
.open = blktap_device_open,
.release = blktap_device_release,
.ioctl = blktap_device_ioctl,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
.getgeo = blktap_device_getgeo
-#endif
};
static int
@@ -1005,11 +983,7 @@
if (!rq)
goto error;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
elevator_init(rq, "noop");
-#else
- elevator_init(rq, &elevator_noop);
-#endif
gd->queue = rq;
rq->queuedata = dev;
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home