X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Fntfs%2Fmalloc.h;h=c921960bff5263ed1ed91f191f2b6677fc208ccc;hb=9c920a8402f2bb9bd931801d429b65f4eb6a262b;hp=c8548a5336e000ae00c3dfed37797703877180df;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/fs/ntfs/malloc.h b/fs/ntfs/malloc.h
index c8548a533..c921960bf 100644
--- a/fs/ntfs/malloc.h
+++ b/fs/ntfs/malloc.h
@@ -37,10 +37,13 @@
 static inline void *ntfs_malloc_nofs(unsigned long size)
 {
 	if (likely(size <= PAGE_SIZE)) {
-		BUG_ON(!size);
-		/* kmalloc() has per-CPU caches so is faster for now. */
-		return kmalloc(PAGE_SIZE, GFP_NOFS);
-		/* return (void *)__get_free_page(GFP_NOFS | __GFP_HIGHMEM); */
+		if (likely(size)) {
+			/* kmalloc() has per-CPU caches so is faster for now. */
+			return kmalloc(PAGE_SIZE, GFP_NOFS);
+			/* return (void *)__get_free_page(GFP_NOFS |
+					__GFP_HIGHMEM); */
+		}
+		BUG();
 	}
 	if (likely(size >> PAGE_SHIFT < num_physpages))
 		return __vmalloc(size, GFP_NOFS | __GFP_HIGHMEM, PAGE_KERNEL);
@@ -51,9 +54,8 @@ static inline void ntfs_free(void *addr)
 {
 	if (likely(((unsigned long)addr < VMALLOC_START) ||
 			((unsigned long)addr >= VMALLOC_END ))) {
-		kfree(addr);
-		/* free_page((unsigned long)addr); */
-		return;
+		return kfree(addr);
+		/* return free_page((unsigned long)addr); */
 	}
 	vfree(addr);
 }