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

Commit 2fc1e948 authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by Linus Torvalds
Browse files

fs/proc.c: use rb_entry_safe() instead of rb_entry() 



Better to use existing macro that rewriting them.

Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b208d54b

fs/proc/generic.c

+4 −12
Original line number Diff line number Diff line
@@ -41,22 +41,14 @@ static int proc_match(unsigned int len, const char *name, struct proc_dir_entry 


static struct proc_dir_entry *pde_subdir_first(struct proc_dir_entry *dir)

{

	struct rb_node *node = rb_first(&dir->subdir);



	if (node == NULL)

		return NULL;



	return rb_entry(node, struct proc_dir_entry, subdir_node);

	return rb_entry_safe(rb_first(&dir->subdir), struct proc_dir_entry,

			     subdir_node);

}



static struct proc_dir_entry *pde_subdir_next(struct proc_dir_entry *dir)

{

	struct rb_node *node = rb_next(&dir->subdir_node);



	if (node == NULL)

		return NULL;



	return rb_entry(node, struct proc_dir_entry, subdir_node);

	return rb_entry_safe(rb_next(&dir->subdir_node), struct proc_dir_entry,

			     subdir_node);

}



static struct proc_dir_entry *pde_subdir_find(struct proc_dir_entry *dir,