The patch titled
Subject: fs/proc.c: use rb_entry_safe() instead of rb_entry()
has been removed from the -mm tree. Its filename was
fs-proc-use-rb_entry_safe-instead-of-rb_entry.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Nicolas Dichtel <nicolas.dichtel@xxxxxxxxx>
Subject: fs/proc.c: use rb_entry_safe() instead of rb_entry()
Better to use existing macro that rewriting them.
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/proc/generic.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff -puN fs/proc/generic.c~fs-proc-use-rb_entry_safe-instead-of-rb_entry fs/proc/generic.c
--- a/fs/proc/generic.c~fs-proc-use-rb_entry_safe-instead-of-rb_entry
+++ a/fs/proc/generic.c
@@ -41,22 +41,14 @@ static int proc_match(unsigned int len,
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,
_
Patches currently in -mm which might be from nicolas.dichtel@xxxxxxxxx are
origin.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
