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

Commit 05725f7e authored by Jiri Pirko's avatar Jiri Pirko Committed by Ingo Molnar
Browse files

rculist: use list_entry_rcu in places where it's appropriate 



Use previously introduced list_entry_rcu instead of an open-coded
list_entry + rcu_dereference combination.

Signed-off-by: default avatarJiri Pirko <jpirko@redhat.com>
Reviewed-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: dipankar@in.ibm.com
LKML-Reference: <20090414181715.GA3634@psychotron.englab.brq.redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 72c6a987

include/linux/sched.h

+5 −3
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ struct sched_param { 
#include <linux/proportions.h>

#include <linux/seccomp.h>

#include <linux/rcupdate.h>

#include <linux/rculist.h>

#include <linux/rtmutex.h>



#include <linux/time.h>
@@ -2010,7 +2011,8 @@ static inline unsigned long wait_task_inactive(struct task_struct *p, 
}

#endif



#define next_task(p)	list_entry(rcu_dereference((p)->tasks.next), struct task_struct, tasks)

#define next_task(p) \

	list_entry_rcu((p)->tasks.next, struct task_struct, tasks)



#define for_each_process(p) \

	for (p = &init_task ; (p = next_task(p)) != &init_task ; )
@@ -2049,7 +2051,7 @@ int same_thread_group(struct task_struct *p1, struct task_struct *p2) 


static inline struct task_struct *next_thread(const struct task_struct *p)

{

	return list_entry(rcu_dereference(p->thread_group.next),

	return list_entry_rcu(p->thread_group.next,

			      struct task_struct, thread_group);

}

ipc/sem.c

+2 −2
Original line number Diff line number Diff line
@@ -1290,7 +1290,7 @@ void exit_sem(struct task_struct *tsk) 
		int i;



		rcu_read_lock();

		un = list_entry(rcu_dereference(ulp->list_proc.next),

		un = list_entry_rcu(ulp->list_proc.next,

				    struct sem_undo, list_proc);

		if (&un->list_proc == &ulp->list_proc)

			semid = -1;

security/integrity/ima/ima_fs.c

+2 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static void *ima_measurements_next(struct seq_file *m, void *v, loff_t *pos) 
	 * against concurrent list-extension

	 */

	rcu_read_lock();

	qe = list_entry(rcu_dereference(qe->later.next),

	qe = list_entry_rcu(qe->later.next,

			    struct ima_queue_entry, later);

	rcu_read_unlock();

	(*pos)++;

security/smack/smackfs.c

+4 −4
Original line number Diff line number Diff line
@@ -734,7 +734,7 @@ static void smk_netlbladdr_insert(struct smk_netlbladdr *new) 
		return;

	}



	m = list_entry(rcu_dereference(smk_netlbladdr_list.next),

	m = list_entry_rcu(smk_netlbladdr_list.next,

			   struct smk_netlbladdr, list);



	/* the comparison '>' is a bit hacky, but works */
@@ -748,7 +748,7 @@ static void smk_netlbladdr_insert(struct smk_netlbladdr *new) 
			list_add_rcu(&new->list, &m->list);

			return;

		}

		m_next = list_entry(rcu_dereference(m->list.next),

		m_next = list_entry_rcu(m->list.next,

					struct smk_netlbladdr, list);

		if (new->smk_mask.s_addr > m_next->smk_mask.s_addr) {

			list_add_rcu(&new->list, &m->list);