From bec1c694867e36f6c3a3da81d50c6ef146913b70 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sat, 18 Jun 2011 20:17:22 -0400
Subject: [PATCH] --- yaml --- r: 253836 b: refs/heads/master c:
 a63ab94d67879bc0630ea9821c582ddf58ba5527 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/fs/logfs/dir.c | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 4b6ee339a2f2..490b2b3dc58a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b419951f1e44c8a46fccfc6551eca9a9980acd6
+refs/heads/master: a63ab94d67879bc0630ea9821c582ddf58ba5527
diff --git a/trunk/fs/logfs/dir.c b/trunk/fs/logfs/dir.c
index 9ed89d1663f8..1afae26cf236 100644
--- a/trunk/fs/logfs/dir.c
+++ b/trunk/fs/logfs/dir.c
@@ -555,13 +555,6 @@ static int logfs_symlink(struct inode *dir, struct dentry *dentry,
 	return __logfs_create(dir, dentry, inode, target, destlen);
 }
 
-static int logfs_permission(struct inode *inode, int mask, unsigned int flags)
-{
-	if (flags & IPERM_FLAG_RCU)
-		return -ECHILD;
-	return generic_permission(inode, mask, flags, NULL);
-}
-
 static int logfs_link(struct dentry *old_dentry, struct inode *dir,
 		struct dentry *dentry)
 {
@@ -820,7 +813,6 @@ const struct inode_operations logfs_dir_iops = {
 	.mknod		= logfs_mknod,
 	.rename		= logfs_rename,
 	.rmdir		= logfs_rmdir,
-	.permission	= logfs_permission,
 	.symlink	= logfs_symlink,
 	.unlink		= logfs_unlink,
 };