diff options
| author | James Morris <[email protected]> | 2011-03-15 22:41:17 +0000 |
|---|---|---|
| committer | James Morris <[email protected]> | 2011-03-15 22:41:17 +0000 |
| commit | a002951c97ff8da49938c982a4c236bf2fafdc9f (patch) | |
| tree | d43e7885ea7376df0a47a0fc8ceca66dc5bfa357 /fs/ext2/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 | kernel-a002951c97ff8da49938c982a4c236bf2fafdc9f.tar.gz kernel-a002951c97ff8da49938c982a4c236bf2fafdc9f.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'fs/ext2/ialloc.c')
| -rw-r--r-- | fs/ext2/ialloc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c index ad70479aabff..ee9ed31948e1 100644 --- 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; |