From 9d36d2793267f72ab99e2c9fa6eb8d091e38c91e Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Tue, 21 Jun 2011 01:01:59 -0400
Subject: [PATCH] --- yaml --- r: 257327 b: refs/heads/master c:
 beefebf1aa611242e022e71bae87034f415d3314 h: refs/heads/master i:   257325:
 88b1e46f9937233990868bfb3cf34f5778709716   257323:
 14483957a8fbbfe2402efc6da49070e2f08dee26   257319:
 3764a7e731de69e4fd36be282dd2cb390aadb07d   257311:
 50c208cae2b9084b3a24aa605008be7504e7c000 v: v3

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

diff --git a/[refs] b/[refs]
index 61d4daf12ef3..72c9d49226d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 729cdb3a1ee03a4363f9c7e66ddd979727e99e1f
+refs/heads/master: beefebf1aa611242e022e71bae87034f415d3314
diff --git a/trunk/fs/ecryptfs/inode.c b/trunk/fs/ecryptfs/inode.c
index bec75f8e91ac..799e01055f22 100644
--- a/trunk/fs/ecryptfs/inode.c
+++ b/trunk/fs/ecryptfs/inode.c
@@ -944,8 +944,6 @@ int ecryptfs_truncate(struct dentry *dentry, loff_t new_length)
 static int
 ecryptfs_permission(struct inode *inode, int mask)
 {
-	if (mask & MAY_NOT_BLOCK)
-		return -ECHILD;
 	return inode_permission(ecryptfs_inode_to_lower(inode), mask);
 }