Commit 36f7f284 authored by KaiGai Kohei's avatar KaiGai Kohei Committed by James Morris

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: default avatarKaiGai Kohei <kaigai@ak.jp.nec.com>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 8b0c543e
...@@ -197,8 +197,7 @@ const char *security_get_initial_sid_context(u32 sid); ...@@ -197,8 +197,7 @@ const char *security_get_initial_sid_context(u32 sid);
extern struct page *selinux_kernel_status_page(void); extern struct page *selinux_kernel_status_page(void);
#define SELINUX_KERNEL_STATUS_VERSION 1 #define SELINUX_KERNEL_STATUS_VERSION 1
struct selinux_kernel_status struct selinux_kernel_status {
{
u32 version; /* version number of thie structure */ u32 version; /* version number of thie structure */
u32 sequence; /* sequence number of seqlock logic */ u32 sequence; /* sequence number of seqlock logic */
u32 enforcing; /* current setting of enforcing mode */ u32 enforcing; /* current setting of enforcing mode */
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
* In most cases, application shall confirm the kernel status is not * In most cases, application shall confirm the kernel status is not
* changed without any system call invocations. * 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); static DEFINE_MUTEX(selinux_status_lock);
/* /*
...@@ -50,11 +50,10 @@ struct page *selinux_kernel_status_page(void) ...@@ -50,11 +50,10 @@ struct page *selinux_kernel_status_page(void)
struct page *result = NULL; struct page *result = NULL;
mutex_lock(&selinux_status_lock); mutex_lock(&selinux_status_lock);
if (!selinux_status_page) if (!selinux_status_page) {
{
selinux_status_page = alloc_page(GFP_KERNEL|__GFP_ZERO); selinux_status_page = alloc_page(GFP_KERNEL|__GFP_ZERO);
if (selinux_status_page)
{ if (selinux_status_page) {
status = page_address(selinux_status_page); status = page_address(selinux_status_page);
status->version = SELINUX_KERNEL_STATUS_VERSION; status->version = SELINUX_KERNEL_STATUS_VERSION;
...@@ -86,8 +85,7 @@ void selinux_status_update_setenforce(int enforcing) ...@@ -86,8 +85,7 @@ void selinux_status_update_setenforce(int enforcing)
struct selinux_kernel_status *status; struct selinux_kernel_status *status;
mutex_lock(&selinux_status_lock); mutex_lock(&selinux_status_lock);
if (selinux_status_page) if (selinux_status_page) {
{
status = page_address(selinux_status_page); status = page_address(selinux_status_page);
status->sequence++; status->sequence++;
...@@ -112,8 +110,7 @@ void selinux_status_update_policyload(int seqno) ...@@ -112,8 +110,7 @@ void selinux_status_update_policyload(int seqno)
struct selinux_kernel_status *status; struct selinux_kernel_status *status;
mutex_lock(&selinux_status_lock); mutex_lock(&selinux_status_lock);
if (selinux_status_page) if (selinux_status_page) {
{
status = page_address(selinux_status_page); status = page_address(selinux_status_page);
status->sequence++; status->sequence++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment