diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-11 19:14:54 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-11 19:14:54 +0200 |
| commit | 32983696a48a6c41d99f3eca82ba7510a552d843 (patch) | |
| tree | ab793556d6a9d2d4e0f366eed58e74b8e705cd8c /fs/jfs/jfs_acl.h | |
| parent | [PATCH] Sun HME: enable and map PCI ROM properly (diff) | |
| parent | JFS: Implement jfs_init_security (diff) | |
| download | linux-32983696a48a6c41d99f3eca82ba7510a552d843.tar.xz linux-32983696a48a6c41d99f3eca82ba7510a552d843.zip | |
Merge branch 'for-linus' from kernel.org:/.../shaggy/jfs-2.6 manually
Clash due to new delete_inode behavior (the filesystem now needs to do
the truncate_inode_pages() call itself).
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/jfs/jfs_acl.h')
| -rw-r--r-- | fs/jfs/jfs_acl.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/fs/jfs/jfs_acl.h b/fs/jfs/jfs_acl.h index a3acd3eec059..a76293767c73 100644 --- a/fs/jfs/jfs_acl.h +++ b/fs/jfs/jfs_acl.h @@ -21,8 +21,16 @@ #ifdef CONFIG_JFS_POSIX_ACL int jfs_permission(struct inode *, int, struct nameidata *); -int jfs_init_acl(struct inode *, struct inode *); +int jfs_init_acl(tid_t, struct inode *, struct inode *); int jfs_setattr(struct dentry *, struct iattr *); -#endif /* CONFIG_JFS_POSIX_ACL */ +#else + +static inline int jfs_init_acl(tid_t tid, struct inode *inode, + struct inode *dir) +{ + return 0; +} + +#endif #endif /* _H_JFS_ACL */ |