diff --git a/[refs] b/[refs]
index 84295de984c7..c5e64f01e92a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f273ab848b7cbc0088b0ac7457b3769e6566074e
+refs/heads/master: 6216ff18839bf302805f67c93e8bc344387c513b
diff --git a/trunk/fs/xfs/linux-2.6/kmem.c b/trunk/fs/xfs/linux-2.6/kmem.c
index 80b9340488e5..d59737589815 100644
--- a/trunk/fs/xfs/linux-2.6/kmem.c
+++ b/trunk/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;
 }