diff options
| author | Paul Moore <paul.moore@hp.com> | 2008-01-29 08:37:52 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-01-30 08:17:16 +1100 |
| commit | c783f1ce5712530ba404807c55d77ac782eb8a7d (patch) | |
| tree | 3153ec98b5c6d57eb5a0aad43389d4faa6d63586 /net/netlabel/netlabel_kapi.c | |
| parent | 0ba6c33bcddc64a54b5f1c25a696c4767dc76292 (diff) | |
| download | op-kernel-dev-c783f1ce5712530ba404807c55d77ac782eb8a7d.zip op-kernel-dev-c783f1ce5712530ba404807c55d77ac782eb8a7d.tar.gz | |
NetLabel: Remove unneeded RCU read locks
This patch removes some unneeded RCU read locks as we can treat the reads as
"safe" even without RCU. It also converts the NetLabel configuration refcount
from a spinlock protected u32 into atomic_t to be more consistent with the rest
of the kernel.
Signed-off-by: Paul Moore <paul.moore@hp.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'net/netlabel/netlabel_kapi.c')
| -rw-r--r-- | net/netlabel/netlabel_kapi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/netlabel/netlabel_kapi.c b/net/netlabel/netlabel_kapi.c index 4f50949..d3762ea 100644 --- a/net/netlabel/netlabel_kapi.c +++ b/net/netlabel/netlabel_kapi.c @@ -34,6 +34,7 @@ #include <net/netlabel.h> #include <net/cipso_ipv4.h> #include <asm/bug.h> +#include <asm/atomic.h> #include "netlabel_domainhash.h" #include "netlabel_unlabeled.h" @@ -262,7 +263,7 @@ int netlbl_enabled(void) /* At some point we probably want to expose this mechanism to the user * as well so that admins can toggle NetLabel regardless of the * configuration */ - return (netlbl_mgmt_protocount_value() > 0 ? 1 : 0); + return (atomic_read(&netlabel_mgmt_protocount) > 0); } /** |
