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
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
fs
/
jffs2
/
acl.c
diff --git
a/fs/jffs2/acl.c
b/fs/jffs2/acl.c
index
4c80404
..
d987137
100644
(file)
--- a/
fs/jffs2/acl.c
+++ b/
fs/jffs2/acl.c
@@
-314,7
+314,7
@@
static int jffs2_check_acl(struct inode *inode, int mask)
return -EAGAIN;
}
-int jffs2_permission(struct inode *inode, int mask
, struct nameidata *nd
)
+int jffs2_permission(struct inode *inode, int mask)
{
return generic_permission(inode, mask, jffs2_check_acl);
}