X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=mm%2Fshmem_acl.c;h=8e5aadd7dcd6aef09f581d3ff925072cc494b0c0;hb=cf2fa66055d718ae13e62451bb546505f63906a2;hp=c946bf4687181a301b33f506ee7b454b1fed6e05;hpb=db1a19b38f3a85f475b4ad716c71be133d8ca48e;p=deliverable%2Flinux.git

diff --git a/mm/shmem_acl.c b/mm/shmem_acl.c
index c946bf468718..8e5aadd7dcd6 100644
--- a/mm/shmem_acl.c
+++ b/mm/shmem_acl.c
@@ -35,7 +35,7 @@ shmem_get_acl(struct inode *inode, int type)
 }
 
 /**
- * shmem_get_acl  -   generic_acl_operations->setacl() operation
+ * shmem_set_acl  -   generic_acl_operations->setacl() operation
  */
 static void
 shmem_set_acl(struct inode *inode, int type, struct posix_acl *acl)
@@ -191,7 +191,7 @@ shmem_check_acl(struct inode *inode, int mask)
  * shmem_permission  -  permission() inode operation
  */
 int
-shmem_permission(struct inode *inode, int mask, struct nameidata *nd)
+shmem_permission(struct inode *inode, int mask)
 {
 	return generic_permission(inode, mask, shmem_check_acl);
 }