From e4bf97dc7a23dac4089bd150d4a5b1dd7b8f2966 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 24 Feb 2010 21:12:11 -0800 Subject: [PATCH] --- yaml --- r: 180775 b: refs/heads/master c: 7491612c7d2cf560bb96dc02bb53d555b41adbb8 h: refs/heads/master i: 180773: b8de7b36344614f955fee5b57a948f6e5028e4c2 180771: f5a3d18864ee9ab65351fc5a3ce31186c8e4e74f 180767: 38712af0a263b1c3a905fe242d7139fd2706878f v: v3 --- [refs] | 2 +- trunk/security/integrity/ima/ima_iint.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1d8692e9c365..430f971665b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 453d3131ec7aab82eaaa8401a50522a337092aa8 +refs/heads/master: 7491612c7d2cf560bb96dc02bb53d555b41adbb8 diff --git a/trunk/security/integrity/ima/ima_iint.c b/trunk/security/integrity/ima/ima_iint.c index 0d83edcfc402..2d4d05d92fda 100644 --- a/trunk/security/integrity/ima/ima_iint.c +++ b/trunk/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; }