git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shmfs: use 'check_acl' instead of 'permission'
[pandora-kernel.git]
/
mm
/
shmem_acl.c
diff --git
a/mm/shmem_acl.c
b/mm/shmem_acl.c
index
606a8e7
..
df2c87f
100644
(file)
--- a/
mm/shmem_acl.c
+++ b/
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()
*/
/**
* 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);
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;
}
}
return -EAGAIN;
}
-
-/**
- * shmem_permission - permission() inode operation
- */
-int
-shmem_permission(struct inode *inode, int mask)
-{
- return generic_permission(inode, mask, shmem_check_acl);
-}