[XFS] Don't fail pagebuf allocations

SGI Modid: xfs-linux:xfs-kern:165648a

diff --git a/fs/xfs/linux/xfs_buf.c b/fs/xfs/linux/xfs_buf.c
index a6c09faca0b09a2981ffbf16ba56d21c4ae4b835..07edfd52478510f2c23aebe0a02edab872764c40 100644 (file)
--- a/fs/xfs/linux/xfs_buf.c
+++ b/fs/xfs/linux/xfs_buf.c
@@ -193,10 +193,14 @@ EXPORT_SYMBOL(pagebuf_trace_buf);
        (((flags) & PBF_READ_AHEAD) ? GFP_READAHEAD : \
         ((flags) & PBF_DONT_BLOCK) ? GFP_NOFS : GFP_KERNEL)
 
+#define pb_to_km(flags) \
+        (((flags) & PBF_DONT_BLOCK) ? KM_NOFS : KM_SLEEP)
+
+
 #define pagebuf_allocate(flags) \
-       kmem_cache_alloc(pagebuf_cache, pb_to_gfp(flags))
+       kmem_zone_alloc(pagebuf_cache, pb_to_km(flags))
 #define pagebuf_deallocate(pb) \
-       kmem_cache_free(pagebuf_cache, (pb));
+       kmem_zone_free(pagebuf_cache, (pb));
 
 /*
  * Pagebuf hashing