diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-02-25 10:59:56 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-02-25 10:59:56 +0100 |
| commit | 669d6ece85f7750c01803662c8d8d3db8f726361 (patch) | |
| tree | 7f51fdc0274ff3c2da0ffb309d77f6158ff0dc0a /security | |
| parent | 5f0028625b529f647e747d043ebde087be60e5b7 (diff) | |
| parent | baac35c4155a8aa826c70acee6553368ca5243a2 (diff) | |
| download | lwn-669d6ece85f7750c01803662c8d8d3db8f726361.tar.gz lwn-669d6ece85f7750c01803662c8d8d3db8f726361.zip | |
Merge branch 'linus' into rt/head
Conflicts:
Makefile
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'security')
| -rw-r--r-- | security/integrity/ima/ima_iint.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/security/integrity/ima/ima_iint.c b/security/integrity/ima/ima_iint.c index 0d83edcfc402..2d4d05d92fda 100644 --- a/security/integrity/ima/ima_iint.c +++ b/security/integrity/ima/ima_iint.c @@ -63,12 +63,11 @@ int ima_inode_alloc(struct inode *inode) spin_lock(&ima_iint_lock); rc = radix_tree_insert(&ima_iint_store, (unsigned long)inode, iint); spin_unlock(&ima_iint_lock); + radix_tree_preload_end(); out: if (rc < 0) kmem_cache_free(iint_cache, iint); - radix_tree_preload_end(); - return rc; } |