From e9644d62263341636fc22a886acab8212c755ba8 Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis@redhat.com>
Date: Fri, 18 Apr 2008 17:38:30 -0400
Subject: [PATCH] --- yaml --- r: 91711 b: refs/heads/master c:
 7696ee80ac037959fc708156255d1bfec1f9ad70 h: refs/heads/master i:   91709:
 dbe78c09913e4a64f63cd3c358c10f9ea2ef8975   91707:
 da8c8b4b44cf372d139d0f3beeffbd9f1968ce91   91703:
 d693e0dd9b9588a11e18db05e186849fdc9c0350   91695:
 f5620d4fe7155fc2992ce6718e6e6430be43f75a   91679:
 7b1d25ed24945f00c5ba052a9206f56bb89f3254   91647:
 1e16c1724abad10851efba1ffe42cac9f60bcf8e v: v3

---
 [refs]                              | 2 +-
 trunk/security/selinux/ss/ebitmap.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 6e5feecb42bd..5fe7e81b311d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c2b240ef2ae05a0081b4004176fd5838cecc4f6
+refs/heads/master: 7696ee80ac037959fc708156255d1bfec1f9ad70
diff --git a/trunk/security/selinux/ss/ebitmap.c b/trunk/security/selinux/ss/ebitmap.c
index e499af474b35..ddc275490af8 100644
--- a/trunk/security/selinux/ss/ebitmap.c
+++ b/trunk/security/selinux/ss/ebitmap.c
@@ -411,11 +411,10 @@ int ebitmap_read(struct ebitmap *e, void *fp)
 			}
 			/* round down */
 			tmp->startbit = startbit - (startbit % EBITMAP_SIZE);
-			if (n) {
+			if (n)
 				n->next = tmp;
-			} else {
+			else
 				e->node = tmp;
-			}
 			n = tmp;
 		} else if (startbit <= n->startbit) {
 			printk(KERN_ERR "SELinux: ebitmap: start bit %d"