---

yaml --- r: 298646 b: refs/heads/master c: 703bf2d h: refs/heads/master v: v3
git-mirror · Apr 5, 2012 · d997d1b · d997d1b
1 parent cc1a91c
commit d997d1b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b82c32872db20667d6ee8e2ea1e7bdec791bdcc7
+refs/heads/master: 703bf2d122c95412a30f72658c53ad6292867b0b
diff --git a/trunk/fs/xattr.c b/trunk/fs/xattr.c
@@ -496,7 +496,7 @@ listxattr(struct dentry *d, char __user *list, size_t size)
 	if (size) {
 		if (size > XATTR_LIST_MAX)
 			size = XATTR_LIST_MAX;
-		klist = kmalloc(size, GFP_KERNEL);
+		klist = kmalloc(size, __GFP_NOWARN | GFP_KERNEL);
 		if (!klist)
 			return -ENOMEM;
 	}