Merge branch 'writeback-for-2.6.34' into nfs-for-2.6.34

[safe/jmp/linux-2.6] / fs / ntfs / malloc.h

diff --git a/fs/ntfs/malloc.h b/fs/ntfs/malloc.h
index e38e402..a44b14c 100644 (file)
--- a/fs/ntfs/malloc.h
+++ b/fs/ntfs/malloc.h
@@ -47,7 +47,7 @@ static inline void *__ntfs_malloc(unsigned long size, gfp_t gfp_mask)
                return kmalloc(PAGE_SIZE, gfp_mask & ~__GFP_HIGHMEM);
                /* return (void *)__get_free_page(gfp_mask); */
        }
-       if (likely(size >> PAGE_SHIFT < num_physpages))
+       if (likely((size >> PAGE_SHIFT) < totalram_pages))
                return __vmalloc(size, gfp_mask, PAGE_KERNEL);
        return NULL;
 }
@@ -85,8 +85,7 @@ static inline void *ntfs_malloc_nofs_nofail(unsigned long size)
 
 static inline void ntfs_free(void *addr)
 {
-       if (likely(((unsigned long)addr < VMALLOC_START) ||
-                       ((unsigned long)addr >= VMALLOC_END ))) {
+       if (!is_vmalloc_addr(addr)) {
                kfree(addr);
                /* free_page((unsigned long)addr); */
                return;