Merge branch 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...

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

diff --git a/fs/ocfs2/xattr.h b/fs/ocfs2/xattr.h
index 4f913053d5ee0d7499a512422093fd2cb8d478e5..08e36389f56d025858dc377d0294911682e657fe 100644 (file)
--- a/fs/ocfs2/xattr.h
+++ b/fs/ocfs2/xattr.h
@@ -93,5 +93,8 @@ int ocfs2_xattr_attach_refcount_tree(struct inode *inode,
 int ocfs2_reflink_xattrs(struct inode *old_inode,
                         struct buffer_head *old_bh,
                         struct inode *new_inode,
-                        struct buffer_head *new_bh);
+                        struct buffer_head *new_bh,
+                        bool preserve_security);
+int ocfs2_init_security_and_acl(struct inode *dir,
+                               struct inode *inode);
 #endif /* OCFS2_XATTR_H */