Prev: [patch 001/123] ahci: disable FPDMA auto-activate optimization on NVIDIA AHCI
Next: [patch 008/123] HID: usbhid: introduce timeout for stuck ctrl/out URBs
From: Greg KH on 12 Mar 2010 20:40
2.6.33-stable review patch. If anyone has any objections, please let me know.

-----------------

From: Xiaotian Feng <dfeng(a)redhat.com>

commit baac35c4155a8aa826c70acee6553368ca5243a2 upstream.

If radix_tree_preload is failed in ima_inode_alloc, we don't need
radix_tree_preload_end because kernel is alread preempt enabled

Signed-off-by: Xiaotian Feng <dfeng(a)redhat.com>
Signed-off-by: Mimi Zohar <zohar(a)us.ibm.com>
Signed-off-by: James Morris <jmorris(a)namei.org>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>

---
security/integrity/ima/ima_iint.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

--- 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;
}



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [patch 001/123] ahci: disable FPDMA auto-activate optimization on NVIDIA AHCI
Next: [patch 008/123] HID: usbhid: introduce timeout for stuck ctrl/out URBs