File compcache-kernel-build-fixes.diff of Package compcache

Overview Repositories Revisions Requests Users Attributes Meta

File compcache-kernel-build-fixes.diff of Package compcache (Revision b5ea5108b9b073cc1ea404998900372b)

Currently displaying revision b5ea5108b9b073cc1ea404998900372b , Show latest

---
 ramzswap.c |   23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

--- a/ramzswap.c
+++ b/ramzswap.c
@@ -47,7 +47,11 @@
 
 /* Function declarations */
 static int __init ramzswap_init(void);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
 static int ramzswap_ioctl(struct block_device *, fmode_t, unsigned, unsigned long);
+#else
+static int ramzswap_ioctl(struct inode *, struct file *, unsigned, unsigned long);
+#endif
 static int setup_swap_header(struct ramzswap *, union swap_header *);
 static void ramzswap_set_memlimit(struct ramzswap *, size_t);
 static void ramzswap_set_disksize(struct ramzswap *, size_t);
@@ -923,8 +927,13 @@
 		return 0;
 	}
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
+	if (bio_rw_flagged(bio, BIO_RW_DISCARD))
+		return ramzswap_discard(rzs, bio);
+#elif defined(bio_discard)
 	if (bio_discard(bio))
 		return ramzswap_discard(rzs, bio);
+#endif
 
 	if (!valid_swap_request(rzs, bio)) {
 		stat_inc(rzs->stats.invalid_io);
@@ -1015,6 +1024,7 @@
 
 	set_capacity(rzs->disk, rzs->disksize >> SECTOR_SHIFT);
 
+#ifdef blk_queue_nonrot
 	/*
 	 * We have ident mapping of sectors for ramzswap and
 	 * and the backing swap device. So, this queue flag
@@ -1023,8 +1033,13 @@
 	if (!rzs->backing_swap ||
 			blk_queue_nonrot(rzs->backing_swap->bd_disk->queue))
 		queue_flag_set_unlocked(QUEUE_FLAG_NONROT, rzs->disk->queue);
+#endif
 
+#ifdef QUEUE_FLAG_DISCARD
+	queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, rzs->disk->queue);
+#elif defined(WRITE_DISCARD)
 	blk_queue_set_discard(rzs->disk->queue, ramzswap_prepare_discard);
+#endif
 
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30))
         blk_queue_logical_block_size(rzs->disk->queue, PAGE_SIZE);
@@ -1074,9 +1089,17 @@
 	return 0;
 }
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
 static int ramzswap_ioctl(struct block_device *bdev, fmode_t mode,
 			unsigned int cmd, unsigned long arg)
+#else
+static int ramzswap_ioctl(struct inode *inode, struct file *file,
+			unsigned int cmd, unsigned long arg)
+#endif
 {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
+	struct block_device *bdev = I_BDEV(inode);
+#endif
 	int ret = 0;
 	size_t disksize_kb, memlimit_kb;

Places

File compcache-kernel-build-fixes.diff of Package compcache (Revision b5ea5108b9b073cc1ea404998900372b)

Places