From a8ea89a5b9ffe055af15f8a74eb85cdef843ee95 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 28 Aug 2009 12:04:28 -0700
Subject: [PATCH] --- yaml --- r: 157289 b: refs/heads/master c:
 6d848a488ad83cc3891bb274691118f45ce6aab9 h: refs/heads/master i:   157287:
 17e7a729848361ad50330f87e366938dc80d66d2 v: v3

---
 [refs]                         |  2 +-
 trunk/include/linux/shmem_fs.h |  2 +-
 trunk/mm/shmem.c               |  6 +++---
 trunk/mm/shmem_acl.c           | 11 +----------
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 824b2dd75e3b..7c59d15f3afd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5909ccaa300a4a834ffa275327af4df0b9cb5295
+refs/heads/master: 6d848a488ad83cc3891bb274691118f45ce6aab9
diff --git a/trunk/include/linux/shmem_fs.h b/trunk/include/linux/shmem_fs.h
index abff6c9b413c..6d3f2f449ead 100644
--- a/trunk/include/linux/shmem_fs.h
+++ b/trunk/include/linux/shmem_fs.h
@@ -39,7 +39,7 @@ static inline struct shmem_inode_info *SHMEM_I(struct inode *inode)
 }
 
 #ifdef CONFIG_TMPFS_POSIX_ACL
-int shmem_permission(struct inode *, int);
+int shmem_check_acl(struct inode *, int);
 int shmem_acl_init(struct inode *, struct inode *);
 
 extern struct xattr_handler shmem_xattr_acl_access_handler;
diff --git a/trunk/mm/shmem.c b/trunk/mm/shmem.c
index d713239ce2ce..5a0b3d4055f3 100644
--- a/trunk/mm/shmem.c
+++ b/trunk/mm/shmem.c
@@ -2446,7 +2446,7 @@ static const struct inode_operations shmem_inode_operations = {
 	.getxattr	= generic_getxattr,
 	.listxattr	= generic_listxattr,
 	.removexattr	= generic_removexattr,
-	.permission	= shmem_permission,
+	.check_acl	= shmem_check_acl,
 #endif
 
 };
@@ -2469,7 +2469,7 @@ static const struct inode_operations shmem_dir_inode_operations = {
 	.getxattr	= generic_getxattr,
 	.listxattr	= generic_listxattr,
 	.removexattr	= generic_removexattr,
-	.permission	= shmem_permission,
+	.check_acl	= shmem_check_acl,
 #endif
 };
 
@@ -2480,7 +2480,7 @@ static const struct inode_operations shmem_special_inode_operations = {
 	.getxattr	= generic_getxattr,
 	.listxattr	= generic_listxattr,
 	.removexattr	= generic_removexattr,
-	.permission	= shmem_permission,
+	.check_acl	= shmem_check_acl,
 #endif
 };
 
diff --git a/trunk/mm/shmem_acl.c b/trunk/mm/shmem_acl.c
index 606a8e757a42..df2c87fdae50 100644
--- a/trunk/mm/shmem_acl.c
+++ b/trunk/mm/shmem_acl.c
@@ -157,7 +157,7 @@ shmem_acl_init(struct inode *inode, struct inode *dir)
 /**
  * shmem_check_acl  -  check_acl() callback for generic_permission()
  */
-static int
+int
 shmem_check_acl(struct inode *inode, int mask)
 {
 	struct posix_acl *acl = shmem_get_acl(inode, ACL_TYPE_ACCESS);
@@ -169,12 +169,3 @@ shmem_check_acl(struct inode *inode, int mask)
 	}
 	return -EAGAIN;
 }
-
-/**
- * shmem_permission  -  permission() inode operation
- */
-int
-shmem_permission(struct inode *inode, int mask)
-{
-	return generic_permission(inode, mask, shmem_check_acl);
-}