diff options
| author | KaiGai Kohei <kaigai@ak.jp.nec.com> | 2010-09-30 11:49:55 +0900 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-10-21 10:12:41 +1100 |
| commit | 36f7f28416c97dbb725154930066d115b4447e17 (patch) | |
| tree | c09aed0142158c6fda679bab87012144e5a60372 | |
| parent | 8b0c543e5cb1e47a54d3ea791b8a03b9c8a715db (diff) | |
| download | blackbird-obmc-linux-36f7f28416c97dbb725154930066d115b4447e17.tar.gz blackbird-obmc-linux-36f7f28416c97dbb725154930066d115b4447e17.zip | |
selinux: fix up style problem on /selinux/status
This patch fixes up coding-style problem at this commit:
4f27a7d49789b04404eca26ccde5f527231d01d5
selinux: fast status update interface (/selinux/status)
Signed-off-by: KaiGai Kohei <kaigai@ak.jp.nec.com>
Signed-off-by: James Morris <jmorris@namei.org>
| -rw-r--r-- | security/selinux/include/security.h | 3 | ||||
| -rw-r--r-- | security/selinux/ss/status.c | 15 |
2 files changed, 7 insertions, 11 deletions
diff --git a/security/selinux/include/security.h b/security/selinux/include/security.h index e390e31bb4bf..4b66f19bb1f3 100644 --- a/security/selinux/include/security.h +++ b/security/selinux/include/security.h @@ -197,8 +197,7 @@ const char *security_get_initial_sid_context(u32 sid); extern struct page *selinux_kernel_status_page(void); #define SELINUX_KERNEL_STATUS_VERSION 1 -struct selinux_kernel_status -{ +struct selinux_kernel_status { u32 version; /* version number of thie structure */ u32 sequence; /* sequence number of seqlock logic */ u32 enforcing; /* current setting of enforcing mode */ diff --git a/security/selinux/ss/status.c b/security/selinux/ss/status.c index 5d9b225f8568..d982365f9d1a 100644 --- a/security/selinux/ss/status.c +++ b/security/selinux/ss/status.c @@ -35,7 +35,7 @@ * In most cases, application shall confirm the kernel status is not * changed without any system call invocations. */ -static struct page *selinux_status_page = NULL; +static struct page *selinux_status_page; static DEFINE_MUTEX(selinux_status_lock); /* @@ -50,11 +50,10 @@ struct page *selinux_kernel_status_page(void) struct page *result = NULL; mutex_lock(&selinux_status_lock); - if (!selinux_status_page) - { + if (!selinux_status_page) { selinux_status_page = alloc_page(GFP_KERNEL|__GFP_ZERO); - if (selinux_status_page) - { + + if (selinux_status_page) { status = page_address(selinux_status_page); status->version = SELINUX_KERNEL_STATUS_VERSION; @@ -86,8 +85,7 @@ void selinux_status_update_setenforce(int enforcing) struct selinux_kernel_status *status; mutex_lock(&selinux_status_lock); - if (selinux_status_page) - { + if (selinux_status_page) { status = page_address(selinux_status_page); status->sequence++; @@ -112,8 +110,7 @@ void selinux_status_update_policyload(int seqno) struct selinux_kernel_status *status; mutex_lock(&selinux_status_lock); - if (selinux_status_page) - { + if (selinux_status_page) { status = page_address(selinux_status_page); status->sequence++; |
