Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38dbd7d8 authored by Geliang Tang's avatar Geliang Tang Committed by John Johansen
Browse files

apparmor: use list_next_entry instead of list_entry_next 



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

Signed-off-by: default avatarGeliang Tang <geliangtang@163.com>
Acked-by: default avatarSerge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: default avatarJohn Johansen <john.johansen@canonical.com>
parent de7c4cc9

security/apparmor/apparmorfs.c

+3 −5
Original line number Diff line number Diff line
@@ -553,8 +553,6 @@ int __aa_fs_namespace_mkdir(struct aa_namespace *ns, struct dentry *parent, 
}





#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))



/**
@@ -585,7 +583,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;
@@ -639,7 +637,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;
@@ -648,7 +646,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;