diff options
| author | James Morris <jmorris@namei.org> | 2011-03-15 23:41:17 +0100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-03-15 23:41:17 +0100 |
| commit | a002951c97ff8da49938c982a4c236bf2fafdc9f (patch) | |
| tree | d43e7885ea7376df0a47a0fc8ceca66dc5bfa357 /fs/ext3/ialloc.c | |
| parent | Linux 2.6.38 (diff) | |
| parent | Merge branch 'security-next' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| download | linux-a002951c97ff8da49938c982a4c236bf2fafdc9f.tar.xz linux-a002951c97ff8da49938c982a4c236bf2fafdc9f.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'fs/ext3/ialloc.c')
| -rw-r--r-- | fs/ext3/ialloc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ext3/ialloc.c b/fs/ext3/ialloc.c index 9724aef22460..bfc2dc43681d 100644 --- a/fs/ext3/ialloc.c +++ b/fs/ext3/ialloc.c @@ -404,7 +404,8 @@ static int find_group_other(struct super_block *sb, struct inode *parent) * For other inodes, search forward from the parent directory's block * group to find a free inode. */ -struct inode *ext3_new_inode(handle_t *handle, struct inode * dir, int mode) +struct inode *ext3_new_inode(handle_t *handle, struct inode * dir, + const struct qstr *qstr, int mode) { struct super_block *sb; struct buffer_head *bitmap_bh = NULL; @@ -589,7 +590,7 @@ got: if (err) goto fail_free_drop; - err = ext3_init_security(handle,inode, dir); + err = ext3_init_security(handle, inode, dir, qstr); if (err) goto fail_free_drop; |