diff options
| author | Sebastian Schmelzer | 2008-04-09 03:56:28 +0200 |
|---|---|---|
| committer | Sebastian Schmelzer | 2008-04-09 03:56:28 +0200 |
| commit | 9674df3543fd2ca8dc722f51100c5732e3dbdd7b (patch) | |
| tree | ab25e252ab67bf681633c4d7847a404ad6b8197b /kernel/cache.c | |
| parent | Import dnbd* from the former openslx-contrib repo as of revision 92. (diff) | |
| download | dnbd-9674df3543fd2ca8dc722f51100c5732e3dbdd7b.tar.gz dnbd-9674df3543fd2ca8dc722f51100c5732e3dbdd7b.tar.xz dnbd-9674df3543fd2ca8dc722f51100c5732e3dbdd7b.zip | |
* added fixes for kernel api changes (kernel >= 2.6.24)
(rq_for_each_bio + bio_for_each_segment => rq_for_each_segment)
* added kernel version check to exclude devfs_* includes/commands
(devfs_* was dropped with 2.6.18)
git-svn-id: http://svn.openslx.org/svn/openslx/contrib/dnbd/trunk@1733 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'kernel/cache.c')
| -rw-r--r-- | kernel/cache.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/kernel/cache.c b/kernel/cache.c index e72b2ff..b47e32b 100644 --- a/kernel/cache.c +++ b/kernel/cache.c @@ -10,6 +10,7 @@ #include <linux/file.h> /* use red-black library of kernel */ #include <linux/rbtree.h> +#include <linux/version.h> #include <asm/uaccess.h> #include "../common/dnbd-cliserv.h" @@ -42,8 +43,12 @@ int dnbd_cache_search(dnbd_cache_t * cache, struct request *req) size_t blksize; void *kaddr; - int i; - struct bio *bio; + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) + int i; + struct bio *bio; + #else + struct req_iterator iter; + #endif struct bio_vec *bvec; int result = 0, rbytes; @@ -75,8 +80,12 @@ int dnbd_cache_search(dnbd_cache_t * cache, struct request *req) found: cache->hits++; offset = cn->rb_data * blksize; + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) rq_for_each_bio(bio, req) { bio_for_each_segment(bvec, bio, i) { + #else + rq_for_each_segment(bvec, req, iter) { + #endif if (bvec->bv_len > blksize) { printk(KERN_WARNING "bvec->bv_len greater than cache block size\n"); @@ -103,7 +112,9 @@ int dnbd_cache_search(dnbd_cache_t * cache, struct request *req) result += rbytes; if (result == blksize) goto out; + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) } + #endif } out: |