[PATCH 3/3] apparmor: use list_next_entry instead of list_entry_next

[Geliang Tang]

list_next_entry has been defined in list.h, so I replace list_entry_next
with it.

Signed-off-by: Geliang Tang <geliangt...@163.com>
---
 security/apparmor/apparmorfs.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
index ad4fa49..7a00bb7 100644
--- a/security/apparmor/apparmorfs.c
+++ b/security/apparmor/apparmorfs.c
@@ -550,8 +550,6 @@ fail2:
 }
 
 
-#define list_entry_next(pos, member) \
-       list_entry(pos->member.next, typeof(*pos), member)
 #define list_entry_is_head(pos, head, member) (&pos->member == (head))
 
 /**
@@ -582,7 +580,7 @@ static struct aa_namespace *__next_namespace(struct 
aa_namespace *root,
        parent = ns->parent;
        while (ns != root) {
                mutex_unlock(&ns->lock);
-               next = list_entry_next(ns, base.list);
+               next = list_next_entry(ns, base.list);
                if (!list_entry_is_head(next, &parent->sub_ns, base.list)) {
                        mutex_lock(&next->lock);
                        return next;
@@ -636,7 +634,7 @@ static struct aa_profile *__next_profile(struct aa_profile 
*p)
        parent = rcu_dereference_protected(p->parent,
                                           mutex_is_locked(&p->ns->lock));
        while (parent) {
-               p = list_entry_next(p, base.list);
+               p = list_next_entry(p, base.list);
                if (!list_entry_is_head(p, &parent->base.profiles, base.list))
                        return p;
                p = parent;
@@ -645,7 +643,7 @@ static struct aa_profile *__next_profile(struct aa_profile 
*p)
        }
 
        /* is next another profile in the namespace */
-       p = list_entry_next(p, base.list);
+       p = list_next_entry(p, base.list);
        if (!list_entry_is_head(p, &ns->base.profiles, base.list))
                return p;
 
-- 
2.5.0


--
To unsubscribe from this list: send the line "unsubscribe 
linux-security-module" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html