diff options
| author | James Morris <jmorris@namei.org> | 2011-03-15 18:41:17 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-03-15 18:41:17 -0400 |
| commit | a002951c97ff8da49938c982a4c236bf2fafdc9f (patch) | |
| tree | d43e7885ea7376df0a47a0fc8ceca66dc5bfa357 /fs/ext4/ialloc.c | |
| parent | 521cb40b0c44418a4fd36dc633f575813d59a43d (diff) | |
| parent | c151694b2c48d956ac8c8c59c6927f89cc29ef70 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'fs/ext4/ialloc.c')
| -rw-r--r-- | fs/ext4/ialloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c index eb9097aec6f0..78b79e1bd7ed 100644 --- a/fs/ext4/ialloc.c +++ b/fs/ext4/ialloc.c | |||
| @@ -1042,7 +1042,7 @@ got: | |||
| 1042 | if (err) | 1042 | if (err) |
| 1043 | goto fail_free_drop; | 1043 | goto fail_free_drop; |
| 1044 | 1044 | ||
| 1045 | err = ext4_init_security(handle, inode, dir); | 1045 | err = ext4_init_security(handle, inode, dir, qstr); |
| 1046 | if (err) | 1046 | if (err) |
| 1047 | goto fail_free_drop; | 1047 | goto fail_free_drop; |
| 1048 | 1048 | ||