From 71f8548ea443718a5afb1598f1f3a27a369ccd8b Mon Sep 17 00:00:00 2001 From: Richard Yao Date: Mon, 3 Nov 2014 09:42:44 -0500 Subject: [PATCH] Use is_vmalloc_addr() in vdev_disk.c The initial port of ZFS to Linux required a way to identify virtual memory to make IO to virtual memory backed slabs work, so kmem_virt() was created. Linux 2.6.25 introduced is_vmalloc_addr(), which is logically equivalent to kmem_virt(). Support for kernels before 2.6.26 was later dropped and more recently, support for kernels before Linux 2.6.32 has been dropped. We retire kmem_virt() in favor of is_vmalloc_addr() to cleanup the code. Signed-off-by: Brian Behlendorf --- module/zfs/vdev_disk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/zfs/vdev_disk.c b/module/zfs/vdev_disk.c index ec93884ed9c9..f290fce52718 100644 --- a/module/zfs/vdev_disk.c +++ b/module/zfs/vdev_disk.c @@ -479,7 +479,7 @@ bio_map(struct bio *bio, void *bio_ptr, unsigned int bio_size) if (size > bio_size) size = bio_size; - if (kmem_virt(bio_ptr)) + if (is_vmalloc_addr(bio_ptr)) page = vmalloc_to_page(bio_ptr); else page = virt_to_page(bio_ptr);