1 files changed, 6 insertions, 13 deletions

diff --git a/security/selinux/avc.c b/security/selinux/avc.c
index 4d3fab47e643..dad36a6ab45f 100644
--- a/security/selinux/avc.c
+++ b/security/selinux/avc.c
@@ -188,11 +188,9 @@ int avc_get_hash_stats(char *page)
         for (i = 0; i < AVC_CACHE_SLOTS; i++) {
                 head = &avc_cache.slots[i];
                 if (!hlist_empty(head)) {
-                        struct hlist_node *next;
-
                         slots_used++;
                         chain_len = 0;
-                        hlist_for_each_entry_rcu(node, next, head, list)
+                        hlist_for_each_entry_rcu(node, head, list)
                                 chain_len++;
                         if (chain_len > max_chain_len)
                                 max_chain_len = chain_len;
@@ -241,7 +239,6 @@ static inline int avc_reclaim_node(void)
         int hvalue, try, ecx;
         unsigned long flags;
         struct hlist_head *head;
-        struct hlist_node *next;
         spinlock_t *lock;
 
         for (try = 0, ecx = 0; try < AVC_CACHE_SLOTS; try++) {
@@ -253,7 +250,7 @@ static inline int avc_reclaim_node(void)
                         continue;
 
                 rcu_read_lock();
-                hlist_for_each_entry(node, next, head, list) {
+                hlist_for_each_entry(node, head, list) {
                         avc_node_delete(node);
                         avc_cache_stats_incr(reclaims);
                         ecx++;
@@ -301,11 +298,10 @@ static inline struct avc_node *avc_search_node(u32 ssid, u32 tsid, u16 tclass)
         struct avc_node *node, *ret = NULL;
         int hvalue;
         struct hlist_head *head;
-        struct hlist_node *next;
 
         hvalue = avc_hash(ssid, tsid, tclass);
         head = &avc_cache.slots[hvalue];
-        hlist_for_each_entry_rcu(node, next, head, list) {
+        hlist_for_each_entry_rcu(node, head, list) {
                 if (ssid == node->ae.ssid &&
                     tclass == node->ae.tclass &&
                     tsid == node->ae.tsid) {
@@ -394,7 +390,6 @@ static struct avc_node *avc_insert(u32 ssid, u32 tsid, u16 tclass, struct av_dec
         node = avc_alloc_node();
         if (node) {
                 struct hlist_head *head;
-                struct hlist_node *next;
                 spinlock_t *lock;
 
                 hvalue = avc_hash(ssid, tsid, tclass);
@@ -404,7 +399,7 @@ static struct avc_node *avc_insert(u32 ssid, u32 tsid, u16 tclass, struct av_dec
                 lock = &avc_cache.slots_lock[hvalue];
 
                 spin_lock_irqsave(lock, flag);
-                hlist_for_each_entry(pos, next, head, list) {
+                hlist_for_each_entry(pos, head, list) {
                         if (pos->ae.ssid == ssid &&
                             pos->ae.tsid == tsid &&
                             pos->ae.tclass == tclass) {
@@ -541,7 +536,6 @@ static int avc_update_node(u32 event, u32 perms, u32 ssid, u32 tsid, u16 tclass,
         unsigned long flag;
         struct avc_node *pos, *node, *orig = NULL;
         struct hlist_head *head;
-        struct hlist_node *next;
         spinlock_t *lock;
 
         node = avc_alloc_node();
@@ -558,7 +552,7 @@ static int avc_update_node(u32 event, u32 perms, u32 ssid, u32 tsid, u16 tclass,
 
         spin_lock_irqsave(lock, flag);
 
-        hlist_for_each_entry(pos, next, head, list) {
+        hlist_for_each_entry(pos, head, list) {
                 if (ssid == pos->ae.ssid &&
                     tsid == pos->ae.tsid &&
                     tclass == pos->ae.tclass &&
@@ -614,7 +608,6 @@ out:
 static void avc_flush(void)
 {
         struct hlist_head *head;
-        struct hlist_node *next;
         struct avc_node *node;
         spinlock_t *lock;
         unsigned long flag;
@@ -630,7 +623,7 @@ static void avc_flush(void)
                  * prevent RCU grace periods from ending.
                  */
                 rcu_read_lock();
-                hlist_for_each_entry(node, next, head, list)
+                hlist_for_each_entry(node, head, list)
                         avc_node_delete(node);
                 rcu_read_unlock();
                 spin_unlock_irqrestore(lock, flag);