From b8c8673467230036b48b581d6ffdbb6b904c5a61 Mon Sep 17 00:00:00 2001
From: Dave Chinner <dchinner@redhat.com>
Date: Thu, 23 Jun 2011 01:35:01 +0000
Subject: [PATCH] --- yaml --- r: 254072 b: refs/heads/master c:
 4a33821236f2ef3af0081e8a5eec1301cbed3125 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/fs/xfs/xfs_attr.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 98f8d27deb73..06965c1e923e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df4368a146d2b350b8398babfe11e2088f741d67
+refs/heads/master: 4a33821236f2ef3af0081e8a5eec1301cbed3125
diff --git a/trunk/fs/xfs/xfs_attr.c b/trunk/fs/xfs/xfs_attr.c
index c86375378810..01d2072fb6d4 100644
--- a/trunk/fs/xfs/xfs_attr.c
+++ b/trunk/fs/xfs/xfs_attr.c
@@ -489,6 +489,13 @@ xfs_attr_remove_int(xfs_inode_t *dp, struct xfs_name *name, int flags)
 	args.total = 0;
 	args.whichfork = XFS_ATTR_FORK;
 
+	/*
+	 * we have no control over the attribute names that userspace passes us
+	 * to remove, so we have to allow the name lookup prior to attribute
+	 * removal to fail.
+	 */
+	args.op_flags = XFS_DA_OP_OKNOENT;
+
 	/*
 	 * Attach the dquots to the inode.
 	 */