Эх сурвалжийг харах

xfs: change kmem_free to use generic kvfree()

Change kmem_free to use kvfree() generic function, remove the
duplicated code.

Signed-off-by: Yalin Wang <yalin.wang@sonymobile.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Wang, Yalin 10 жил өмнө
parent
commit
f3d215526e
2 өөрчлөгдсөн 4 нэмэгдсэн , 11 устгасан
  1. 0 10
      fs/xfs/kmem.c
  2. 4 1
      fs/xfs/kmem.h

+ 0 - 10
fs/xfs/kmem.c

@@ -91,16 +91,6 @@ kmem_zalloc_large(size_t size, xfs_km_flags_t flags)
 	return ptr;
 	return ptr;
 }
 }
 
 
-void
-kmem_free(const void *ptr)
-{
-	if (!is_vmalloc_addr(ptr)) {
-		kfree(ptr);
-	} else {
-		vfree(ptr);
-	}
-}
-
 void *
 void *
 kmem_realloc(const void *ptr, size_t newsize, size_t oldsize,
 kmem_realloc(const void *ptr, size_t newsize, size_t oldsize,
 	     xfs_km_flags_t flags)
 	     xfs_km_flags_t flags)

+ 4 - 1
fs/xfs/kmem.h

@@ -63,7 +63,10 @@ kmem_flags_convert(xfs_km_flags_t flags)
 extern void *kmem_alloc(size_t, xfs_km_flags_t);
 extern void *kmem_alloc(size_t, xfs_km_flags_t);
 extern void *kmem_zalloc_large(size_t size, xfs_km_flags_t);
 extern void *kmem_zalloc_large(size_t size, xfs_km_flags_t);
 extern void *kmem_realloc(const void *, size_t, size_t, xfs_km_flags_t);
 extern void *kmem_realloc(const void *, size_t, size_t, xfs_km_flags_t);
-extern void  kmem_free(const void *);
+static inline void  kmem_free(const void *ptr)
+{
+	kvfree(ptr);
+}
 
 
 
 
 extern void *kmem_zalloc_greedy(size_t *, size_t, size_t);
 extern void *kmem_zalloc_greedy(size_t *, size_t, size_t);