diff --git a/[refs] b/[refs] index fa7306a7bc04..f8fa5bda7d27 100644 --- 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 index d6dfd247bb2f..a14d842ccb21 100644 --- 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; }