This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / fs / xfs / linux-2.6 / kmem.c

diff --git a/fs/xfs/linux-2.6/kmem.c b/fs/xfs/linux-2.6/kmem.c
index 364ea8c..fae7176 100644 (file)
--- a/fs/xfs/linux-2.6/kmem.c
+++ b/fs/xfs/linux-2.6/kmem.c
@@ -35,7 +35,6 @@
 #include <linux/vmalloc.h>
 #include <linux/highmem.h>
 #include <linux/swap.h>
-#include <linux/blkdev.h>
 
 #include "time.h"
 #include "kmem.h"
@@ -47,8 +46,7 @@
 void *
 kmem_alloc(size_t size, int flags)
 {
-       int     retries = 0;
-       int     lflags = kmem_flags_convert(flags);
+       int     retries = 0, lflags = kmem_flags_convert(flags);
        void    *ptr;
 
        do {
@@ -59,10 +57,8 @@ kmem_alloc(size_t size, int flags)
                if (ptr || (flags & (KM_MAYFAIL|KM_NOSLEEP)))
                        return ptr;
                if (!(++retries % 100))
-                       printk(KERN_ERR "XFS: possible memory allocation "
-                                       "deadlock in %s (mode:0x%x)\n",
+                       printk(KERN_ERR "possible deadlock in %s (mode:0x%x)\n",
                                        __FUNCTION__, lflags);
-               blk_congestion_wait(WRITE, HZ/50);
        } while (1);
 }
 
@@ -106,8 +102,7 @@ kmem_realloc(void *ptr, size_t newsize, size_t oldsize, int flags)
 void *
 kmem_zone_alloc(kmem_zone_t *zone, int flags)
 {
-       int     retries = 0;
-       int     lflags = kmem_flags_convert(flags);
+       int     retries = 0, lflags = kmem_flags_convert(flags);
        void    *ptr;
 
        do {
@@ -115,10 +110,8 @@ kmem_zone_alloc(kmem_zone_t *zone, int flags)
                if (ptr || (flags & (KM_MAYFAIL|KM_NOSLEEP)))
                        return ptr;
                if (!(++retries % 100))
-                       printk(KERN_ERR "XFS: possible memory allocation "
-                                       "deadlock in %s (mode:0x%x)\n",
+                       printk(KERN_ERR "possible deadlock in %s (mode:0x%x)\n",
                                        __FUNCTION__, lflags);
-               blk_congestion_wait(WRITE, HZ/50);
        } while (1);
 }