From: Vlad Apostolov <vapo@sgi.com>
Date: Thu, 28 Sep 2006 01:06:10 +0000 (+1000)
Subject: [XFS] pv 956240, author: nathans, rv: vapo - Minor fixes in
X-Git-Tag: v2.6.19-rc1~653^2~4
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6216ff18839bf302805f67c93e8bc344387c513b;p=linux-2.6

[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>
---

diff --git a/fs/xfs/linux-2.6/kmem.c b/fs/xfs/linux-2.6/kmem.c
index 80b9340488..d597375898 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;
 }