From 9c4c6ee8bf8676e0feeee96b0480ed0b38a8ac49 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sat, 18 Jun 2011 20:37:33 -0400
Subject: [PATCH] --- yaml --- r: 253839 b: refs/heads/master c:
 1d29b5a2ed7eb8862c9b66daf475f3e4c1a40299 h: refs/heads/master i:   253837:
 be9987b7a12509031af4544ee924bef49ebbe1e9   253835:
 54e2b8433ab32f438834d2df060453bc892e0165   253831:
 2585830db21e23c3ca49fd7150ac772cbca41920   253823:
 9499c302544dbf6f7f5b5ba66cad03a991e898c0 v: v3

---
 [refs]                    | 2 +-
 trunk/fs/reiserfs/xattr.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1886a63248a3..bbd30d5670f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf1279111686d9742cbc4145bc9d526c83f59fea
+refs/heads/master: 1d29b5a2ed7eb8862c9b66daf475f3e4c1a40299
diff --git a/trunk/fs/reiserfs/xattr.c b/trunk/fs/reiserfs/xattr.c
index e8a62f41b458..d78089690965 100644
--- a/trunk/fs/reiserfs/xattr.c
+++ b/trunk/fs/reiserfs/xattr.c
@@ -954,8 +954,6 @@ static int xattr_mount_check(struct super_block *s)
 
 int reiserfs_permission(struct inode *inode, int mask, unsigned int flags)
 {
-	if (flags & IPERM_FLAG_RCU)
-		return -ECHILD;
 	/*
 	 * We don't do permission checks on the internal objects.
 	 * Permissions are determined by the "owning" object.