[XFS] pv 956240, author: nathans, rv: vapo - Minor fixes in

kmem_zalloc_greedy()

SGI-PV: 956240
SGI-Modid: xfs-linux-melb:xfs-kern:26983a

Signed-off-by: Vlad Apostolov <vapo@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>

1 files changed, 11 insertions, 6 deletions

diff --git a/fs/xfs/linux-2.6/kmem.c b/fs/xfs/linux-2.6/kmem.c
index 80b9340488e5..d59737589815 100644
--- a/fs/xfs/linux-2.6/kmem.c
+++ b/fs/xfs/linux-2.6/kmem.c
@@ -72,15 +72,20 @@ void *
 kmem_zalloc_greedy(size_t *size, size_t minsize, size_t maxsize,
                    unsigned int __nocast flags)
 {
-        void    *ptr;
+        void            *ptr;
+        size_t          kmsize = maxsize;
+        unsigned int    kmflags = (flags & ~KM_SLEEP) | KM_NOSLEEP;
 
-        while (!(ptr = kmem_zalloc(maxsize, flags))) {
-                if ((maxsize >>= 1) <= minsize) {
-                        maxsize = minsize;
-                        flags = KM_SLEEP;
+        while (!(ptr = kmem_zalloc(kmsize, kmflags))) {
+                if ((kmsize <= minsize) && (flags & KM_NOSLEEP))
+                        break;
+                if ((kmsize >>= 1) <= minsize) {
+                        kmsize = minsize;
+                        kmflags = flags;
                 }
         }
-        *size = maxsize;
+        if (ptr)
+                *size = kmsize;
         return ptr;
 }