Merge branch 'restriper' of git://github.com/idryomov/btrfs-unstable into integration

[karo-tx-linux.git] / fs / ext4 / xattr.h

diff --git a/fs/ext4/xattr.h b/fs/ext4/xattr.h
index 1ef16520b950c8a4c0c5385ee24f620b147065e2..25b7387ff183f880cdb9ccaf2529ca8c0f218a7b 100644 (file)
--- a/fs/ext4/xattr.h
+++ b/fs/ext4/xattr.h
@@ -145,10 +145,10 @@ ext4_expand_extra_isize_ea(struct inode *inode, int new_extra_isize,
 
 #ifdef CONFIG_EXT4_FS_SECURITY
 extern int ext4_init_security(handle_t *handle, struct inode *inode,
-                               struct inode *dir);
+                             struct inode *dir, const struct qstr *qstr);
 #else
 static inline int ext4_init_security(handle_t *handle, struct inode *inode,
-                               struct inode *dir)
+                                    struct inode *dir, const struct qstr *qstr)
 {
        return 0;
 }