Commit 4e4a7fb7 authored by Geliang Tang's avatar Geliang Tang Committed by Linus Torvalds

proc: use rb_entry()

To make the code clearer, use rb_entry() instead of container_of() to
deal with rbtree.

Link: http://lkml.kernel.org/r/4fd1f82818665705ce75c5156a060ae7caa8e0a9.1482160150.git.geliangtang@gmail.comSigned-off-by: default avatarGeliang Tang <geliangtang@gmail.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Juergen Gross <jgross@suse.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 35ca6953
...@@ -57,9 +57,9 @@ static struct proc_dir_entry *pde_subdir_find(struct proc_dir_entry *dir, ...@@ -57,9 +57,9 @@ static struct proc_dir_entry *pde_subdir_find(struct proc_dir_entry *dir,
struct rb_node *node = dir->subdir.rb_node; struct rb_node *node = dir->subdir.rb_node;
while (node) { while (node) {
struct proc_dir_entry *de = container_of(node, struct proc_dir_entry *de = rb_entry(node,
struct proc_dir_entry, struct proc_dir_entry,
subdir_node); subdir_node);
int result = proc_match(len, name, de); int result = proc_match(len, name, de);
if (result < 0) if (result < 0)
...@@ -80,8 +80,9 @@ static bool pde_subdir_insert(struct proc_dir_entry *dir, ...@@ -80,8 +80,9 @@ static bool pde_subdir_insert(struct proc_dir_entry *dir,
/* Figure out where to put new node */ /* Figure out where to put new node */
while (*new) { while (*new) {
struct proc_dir_entry *this = struct proc_dir_entry *this = rb_entry(*new,
container_of(*new, struct proc_dir_entry, subdir_node); struct proc_dir_entry,
subdir_node);
int result = proc_match(de->namelen, de->name, this); int result = proc_match(de->namelen, de->name, this);
parent = *new; parent = *new;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment