Merge branch 'sparc-perf-events-fixes-for-linus' of git://git.kernel.org/pub/scm...

[~andy/linux] / fs / ocfs2 / acl.h

diff --git a/fs/ocfs2/acl.h b/fs/ocfs2/acl.h
index fef10f1b782b2213f496edd9798f58b91fa45217..8f6389ed4da5ee03d3bc65831ff2b97a9ae3c59e 100644 (file)
--- a/fs/ocfs2/acl.h
+++ b/fs/ocfs2/acl.h
@@ -29,10 +29,29 @@ struct ocfs2_acl_entry {
 #ifdef CONFIG_OCFS2_FS_POSIX_ACL
 
 extern int ocfs2_check_acl(struct inode *, int);
+extern int ocfs2_acl_chmod(struct inode *);
+extern int ocfs2_init_acl(handle_t *, struct inode *, struct inode *,
+                         struct buffer_head *, struct buffer_head *,
+                         struct ocfs2_alloc_context *,
+                         struct ocfs2_alloc_context *);
 
 #else /* CONFIG_OCFS2_FS_POSIX_ACL*/
 
 #define ocfs2_check_acl NULL
+static inline int ocfs2_acl_chmod(struct inode *inode)
+{
+       return 0;
+}
+static inline int ocfs2_init_acl(handle_t *handle,
+                                struct inode *inode,
+                                struct inode *dir,
+                                struct buffer_head *di_bh,
+                                struct buffer_head *dir_bh,
+                                struct ocfs2_alloc_context *meta_ac,
+                                struct ocfs2_alloc_context *data_ac)
+{
+       return 0;
+}
 
 #endif /* CONFIG_OCFS2_FS_POSIX_ACL*/