projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[firefly-linux-kernel-4.4.55.git]
/
mm
/
shmem_acl.c
diff --git
a/mm/shmem_acl.c
b/mm/shmem_acl.c
index f5664c5b9eb1433425501486562c3c6bb98b2237..8e5aadd7dcd6aef09f581d3ff925072cc494b0c0 100644
(file)
--- a/
mm/shmem_acl.c
+++ b/
mm/shmem_acl.c
@@
-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);
}