]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
kernfs: remove KERNFS_ACTIVE_REF and add kernfs_lockdep()
authorTejun Heo <tj@kernel.org>
Fri, 10 Jan 2014 13:57:20 +0000 (08:57 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Jan 2014 21:44:25 +0000 (13:44 -0800)
commita69d001cfc712b96ec9d7ba44d6285702a38dabf
tree295a4f2c57a883d45596078a28278cb054bf9a02
parentea1c472dfeada211a0100daa7976e8e8e779b858
kernfs: remove KERNFS_ACTIVE_REF and add kernfs_lockdep()

There currently are two mechanisms gating active ref lockdep
annotations - KERNFS_LOCKDEP flag and KERNFS_ACTIVE_REF type mask.
The former disables lockdep annotations in kernfs_get/put_active()
while the latter disables all of kernfs_deactivate().

While KERNFS_ACTIVE_REF also behaves as an optimization to skip the
deactivation step for non-file nodes, the benefit is marginal and it
needlessly diverges code paths.  Let's drop KERNFS_ACTIVE_REF and use
KERNFS_LOCKDEP in kernfs_deactivate() too.

While at it, add a test helper kernfs_lockdep() to test KERNFS_LOCKDEP
flag so that it's more convenient and the related code can be compiled
out when not enabled.

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/kernfs/dir.c
include/linux/kernfs.h