Merge branch 'ima-memory-use-fixes'
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Oct 2010 18:37:48 +0000 (11:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Oct 2010 18:37:48 +0000 (11:37 -0700)
commitf9ba5375a8aae4aeea6be15df77e24707a429812
treec6388d7e40f0f6a70d7ba6a4d4aeaa0d1f5591f6
parent45352bbf48e95078b4acd20774f49e72676e1e0f
parentbade72d607c4eb1b1d6c7852c493b75f065a56b5
Merge branch 'ima-memory-use-fixes'

* ima-memory-use-fixes:
  IMA: fix the ToMToU logic
  IMA: explicit IMA i_flag to remove global lock on inode_delete
  IMA: drop refcnt from ima_iint_cache since it isn't needed
  IMA: only allocate iint when needed
  IMA: move read counter into struct inode
  IMA: use i_writecount rather than a private counter
  IMA: use inode->i_lock to protect read and write counters
  IMA: convert internal flags from long to char
  IMA: use unsigned int instead of long for counters
  IMA: drop the inode opencount since it isn't needed for operation
  IMA: use rbtree instead of radix tree for inode information cache
include/linux/fs.h
security/security.c