diff options
author | Alexander Beregalov <a.beregalov@gmail.com> | 2009-03-30 16:32:40 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-30 17:28:58 -0400 |
commit | 77e465867080c2d1e0c410e96dcdcd51e8584a6f (patch) | |
tree | 87400adb4219cda04a39f3fe1b970b64c85c747a | |
parent | dfbbe89e197a77f2c8046a51c74e33e35f878080 (diff) |
reiserfs: fix build breakage
Fix this build error when REISERFS_FS_POSIX_ACL is not set:
fs/reiserfs/inode.c: In function 'reiserfs_new_inode':
fs/reiserfs/inode.c:1919: warning: passing argument 1 of 'reiserfs_inherit_default_acl' from incompatible pointer type
fs/reiserfs/inode.c:1919: warning: passing argument 2 of 'reiserfs_inherit_default_acl' from incompatible pointer type
fs/reiserfs/inode.c:1919: warning: passing argument 3 of 'reiserfs_inherit_default_acl' from incompatible pointer type
fs/reiserfs/inode.c:1919: error: too many arguments to function 'reiserfs_inherit_default_acl'
due to a missing transaction-handle argument in the non-acl
compatibility function.
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Acked-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | include/linux/reiserfs_acl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/reiserfs_acl.h b/include/linux/reiserfs_acl.h index 52240e02de02..8cc65757e47a 100644 --- a/include/linux/reiserfs_acl.h +++ b/include/linux/reiserfs_acl.h | |||
@@ -80,7 +80,8 @@ static inline int reiserfs_acl_chmod(struct inode *inode) | |||
80 | } | 80 | } |
81 | 81 | ||
82 | static inline int | 82 | static inline int |
83 | reiserfs_inherit_default_acl(const struct inode *dir, struct dentry *dentry, | 83 | reiserfs_inherit_default_acl(struct reiserfs_transaction_handle *th, |
84 | const struct inode *dir, struct dentry *dentry, | ||
84 | struct inode *inode) | 85 | struct inode *inode) |
85 | { | 86 | { |
86 | return 0; | 87 | return 0; |