Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm

[firefly-linux-kernel-4.4.55.git] / fs / ext3 / xattr.h

diff --git a/fs/ext3/xattr.h b/fs/ext3/xattr.h
index 377fe720116995caa90f94821bfe808e2c0e4b9b..2be4f69bfa64b301d437e5130868f433a01d5f50 100644 (file)
--- a/fs/ext3/xattr.h
+++ b/fs/ext3/xattr.h
@@ -128,10 +128,10 @@ exit_ext3_xattr(void)
 
 #ifdef CONFIG_EXT3_FS_SECURITY
 extern int ext3_init_security(handle_t *handle, struct inode *inode,
-                               struct inode *dir);
+                             struct inode *dir, const struct qstr *qstr);
 #else
 static inline int ext3_init_security(handle_t *handle, struct inode *inode,
-                               struct inode *dir)
+                                    struct inode *dir, const struct qstr *qstr)
 {
        return 0;
 }