git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[sfrench/cifs-2.6.git]
/
include
/
linux
/
shmem_fs.h
diff --git
a/include/linux/shmem_fs.h
b/include/linux/shmem_fs.h
index f2d12d5a21b891cf53cbe19da6d10ded434aab59..fd83f2584b157b5e76b593344c55f3381f149014 100644
(file)
--- a/
include/linux/shmem_fs.h
+++ b/
include/linux/shmem_fs.h
@@
-43,7
+43,7
@@
static inline struct shmem_inode_info *SHMEM_I(struct inode *inode)
}
#ifdef CONFIG_TMPFS_POSIX_ACL
-int shmem_permission(struct inode *, int
, struct nameidata *
);
+int shmem_permission(struct inode *, int);
int shmem_acl_init(struct inode *, struct inode *);
void shmem_acl_destroy_inode(struct inode *);