diff options
Diffstat (limited to 'fs/xfs')
-rw-r--r-- | fs/xfs/linux-2.6/kmem.c | 3 | ||||
-rw-r--r-- | fs/xfs/linux-2.6/xfs_buf.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/fs/xfs/linux-2.6/kmem.c b/fs/xfs/linux-2.6/kmem.c index ed2b16dff914..e040f1ce1b6a 100644 --- a/fs/xfs/linux-2.6/kmem.c +++ b/fs/xfs/linux-2.6/kmem.c | |||
@@ -92,8 +92,7 @@ kmem_zalloc_greedy(size_t *size, size_t minsize, size_t maxsize, | |||
92 | void | 92 | void |
93 | kmem_free(void *ptr, size_t size) | 93 | kmem_free(void *ptr, size_t size) |
94 | { | 94 | { |
95 | if (((unsigned long)ptr < VMALLOC_START) || | 95 | if (!is_vmalloc_addr(ptr)) { |
96 | ((unsigned long)ptr >= VMALLOC_END)) { | ||
97 | kfree(ptr); | 96 | kfree(ptr); |
98 | } else { | 97 | } else { |
99 | vfree(ptr); | 98 | vfree(ptr); |
diff --git a/fs/xfs/linux-2.6/xfs_buf.c b/fs/xfs/linux-2.6/xfs_buf.c index a49dd8d4b069..0382c19d6523 100644 --- a/fs/xfs/linux-2.6/xfs_buf.c +++ b/fs/xfs/linux-2.6/xfs_buf.c | |||
@@ -709,8 +709,7 @@ static inline struct page * | |||
709 | mem_to_page( | 709 | mem_to_page( |
710 | void *addr) | 710 | void *addr) |
711 | { | 711 | { |
712 | if (((unsigned long)addr < VMALLOC_START) || | 712 | if ((!is_vmalloc_addr(addr))) { |
713 | ((unsigned long)addr >= VMALLOC_END)) { | ||
714 | return virt_to_page(addr); | 713 | return virt_to_page(addr); |
715 | } else { | 714 | } else { |
716 | return vmalloc_to_page(addr); | 715 | return vmalloc_to_page(addr); |