diff options
author | James Morris <jmorris@namei.org> | 2011-03-08 11:38:10 +1100 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2011-03-08 11:38:10 +1100 |
commit | fe3fa43039d47ee4e22caf460b79b62a14937f79 (patch) | |
tree | 9eab8d00f1227b9fe0959f32a62d892ed35803ba /fs/ext4/ialloc.c | |
parent | ee009e4a0d4555ed522a631bae9896399674f064 (diff) | |
parent | 026eb167ae77244458fa4b4b9fc171209c079ba7 (diff) | |
download | op-kernel-dev-fe3fa43039d47ee4e22caf460b79b62a14937f79.zip op-kernel-dev-fe3fa43039d47ee4e22caf460b79b62a14937f79.tar.gz |
Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next
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 eb9097a..78b79e1 100644 --- a/fs/ext4/ialloc.c +++ b/fs/ext4/ialloc.c @@ -1042,7 +1042,7 @@ got: if (err) goto fail_free_drop; - err = ext4_init_security(handle, inode, dir); + err = ext4_init_security(handle, inode, dir, qstr); if (err) goto fail_free_drop; |