Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra

[mirror_ubuntu-bionic-kernel.git] / fs / ext2 / ialloc.c

diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c
index ad70479aabff30d08d1b322846e7e3f49ecbe3d5..ee9ed31948e1229d123cbea2fcea5e45ff42aa3f 100644 (file)
--- a/fs/ext2/ialloc.c
+++ b/fs/ext2/ialloc.c
@@ -429,7 +429,8 @@ found:
        return group;
 }
 
-struct inode *ext2_new_inode(struct inode *dir, int mode)
+struct inode *ext2_new_inode(struct inode *dir, int mode,
+                            const struct qstr *qstr)
 {
        struct super_block *sb;
        struct buffer_head *bitmap_bh = NULL;
@@ -585,7 +586,7 @@ got:
        if (err)
                goto fail_free_drop;
 
-       err = ext2_init_security(inode,dir);
+       err = ext2_init_security(inode, dir, qstr);
        if (err)
                goto fail_free_drop;