From 583155f564675c8c6bc1dc63d1a3ff65a7873af5 Mon Sep 17 00:00:00 2001
From: Dave Chinner <dchinner@redhat.com>
Date: Wed, 7 Mar 2012 04:50:21 +0000
Subject: [PATCH] --- yaml --- r: 294637 b: refs/heads/master c:
 ad650f5b27bc9858360b42aaa0d9204d16115316 h: refs/heads/master i:   294635:
 c08ca9ec372d107bb7c8b82ef8ae2334d0136a12 v: v3

---
 [refs]                   |  2 +-
 trunk/fs/xfs/xfs_ioctl.c | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index ec67f7c5d986..87a95523e10c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6eb2466036358078aed9a65d702cbc97baf0ce65
+refs/heads/master: ad650f5b27bc9858360b42aaa0d9204d16115316
diff --git a/trunk/fs/xfs/xfs_ioctl.c b/trunk/fs/xfs/xfs_ioctl.c
index 76f3ca5cfc36..f588320dc4b9 100644
--- a/trunk/fs/xfs/xfs_ioctl.c
+++ b/trunk/fs/xfs/xfs_ioctl.c
@@ -450,9 +450,12 @@ xfs_attrmulti_attr_get(
 
 	if (*len > XATTR_SIZE_MAX)
 		return EINVAL;
-	kbuf = kmalloc(*len, GFP_KERNEL);
-	if (!kbuf)
-		return ENOMEM;
+	kbuf = kmem_zalloc(*len, KM_SLEEP | KM_MAYFAIL);
+	if (!kbuf) {
+		kbuf = kmem_zalloc_large(*len);
+		if (!kbuf)
+			return ENOMEM;
+	}
 
 	error = xfs_attr_get(XFS_I(inode), name, kbuf, (int *)len, flags);
 	if (error)
@@ -462,7 +465,10 @@ xfs_attrmulti_attr_get(
 		error = EFAULT;
 
  out_kfree:
-	kfree(kbuf);
+	if (is_vmalloc_addr(kbuf))
+		kmem_free_large(kbuf);
+	else
+		kmem_free(kbuf);
 	return error;
 }