diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-12 12:59:05 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-12 12:59:05 +0000 |
| commit | 163849ea9b4c5d50fbd324692461983d18faadad (patch) | |
| tree | 7176a18fea53560eb4092aa103d94a266ab4e60d /include/linux/shmem_fs.h | |
| parent | 2138301e1687bd4f22aa2b4df4829b6ffdae19bc (diff) | |
| parent | 5ee518ecbcb5934e284ea51a19a939c891f5f7ea (diff) | |
Merge branch 'for-2.6.33' into for-2.6.34
Diffstat (limited to 'include/linux/shmem_fs.h')
| -rw-r--r-- | include/linux/shmem_fs.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h index deee7afd8d6..e164291fb3e 100644 --- a/include/linux/shmem_fs.h +++ b/include/linux/shmem_fs.h @@ -41,20 +41,4 @@ static inline struct shmem_inode_info *SHMEM_I(struct inode *inode) extern int init_tmpfs(void); extern int shmem_fill_super(struct super_block *sb, void *data, int silent); -#ifdef CONFIG_TMPFS_POSIX_ACL -int shmem_check_acl(struct inode *, int); -int shmem_acl_init(struct inode *, struct inode *); - -extern struct xattr_handler shmem_xattr_acl_access_handler; -extern struct xattr_handler shmem_xattr_acl_default_handler; - -extern struct generic_acl_operations shmem_acl_ops; - -#else -static inline int shmem_acl_init(struct inode *inode, struct inode *dir) -{ - return 0; -} -#endif /* CONFIG_TMPFS_POSIX_ACL */ - #endif |