summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-06-21 07:01:59 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2011-07-20 07:43:38 +0200
commitbeefebf1aa611242e022e71bae87034f415d3314 (patch)
tree87f7aaeda400872f42a3ff5560e8ac995bb08970 /fs
parentkill IPERM_FLAG_RCU (diff)
downloadlinux-beefebf1aa611242e022e71bae87034f415d3314.tar.xz
linux-beefebf1aa611242e022e71bae87034f415d3314.zip
ecryptfs_inode_permission() doesn't need to bail out on RCU
... now that inode_permission() can take MAY_NOT_BLOCK and handle it properly. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/ecryptfs/inode.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
index bec75f8e91ac..799e01055f22 100644
--- a/fs/ecryptfs/inode.c
+++ b/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);
}