From a21e9d30cd205d942cb87915f44fe3627c39679f Mon Sep 17 00:00:00 2001 From: "Artem B. Bityuckiy" Date: Sun, 10 Jul 2005 16:15:36 +0100 Subject: [PATCH] --- yaml --- r: 4783 b: refs/heads/master c: e4fef6618992bea48b7856ebbd236796b744964f h: refs/heads/master i: 4781: 28a8cf45f89ea47cc6b9c090730a4e356b5a3f83 4779: 94c413e91ef0bb2282817ca1cfdec435170712ce 4775: 40c13f02e21214926e54115b9e7fb51ba3463020 4767: a21694dd488d5c9c7141200c741a05f81ba95d64 v: v3 --- [refs] | 2 +- trunk/fs/jffs2/nodelist.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index ec33a225d0ef..643ea0668f0a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 86ffc0d5f5f0c8a6fe70eccade3f7ae8e9630edf +refs/heads/master: e4fef6618992bea48b7856ebbd236796b744964f diff --git a/trunk/fs/jffs2/nodelist.c b/trunk/fs/jffs2/nodelist.c index c7bbdeec93a6..4991c348f6ec 100644 --- a/trunk/fs/jffs2/nodelist.c +++ b/trunk/fs/jffs2/nodelist.c @@ -7,7 +7,7 @@ * * For licensing information, see the file 'LICENCE' in this directory. * - * $Id: nodelist.c,v 1.97 2005/07/06 15:18:41 dwmw2 Exp $ + * $Id: nodelist.c,v 1.98 2005/07/10 15:15:32 dedekind Exp $ * */ @@ -55,11 +55,11 @@ void jffs2_add_fd_to_list(struct jffs2_sb_info *c, struct jffs2_full_dirent *new }); } -/* Put a new tmp_dnode_info into the list, keeping the list in - order of increasing version -*/ - -static void jffs2_add_tn_to_list(struct jffs2_tmp_dnode_info *tn, struct rb_root *list) +/* + * Put a new tmp_dnode_info into the temporaty RB-tree, keeping the list in + * order of increasing version. + */ +static void jffs2_add_tn_to_tree(struct jffs2_tmp_dnode_info *tn, struct rb_root *list) { struct rb_node **p = &list->rb_node; struct rb_node * parent = NULL; @@ -420,7 +420,7 @@ int jffs2_get_inode_nodes(struct jffs2_sb_info *c, struct jffs2_inode_info *f, D1(printk(KERN_DEBUG "dnode @%08x: ver %u, offset %04x, dsize %04x\n", ref_offset(ref), je32_to_cpu(node.i.version), je32_to_cpu(node.i.offset), je32_to_cpu(node.i.dsize))); - jffs2_add_tn_to_list(tn, &ret_tn); + jffs2_add_tn_to_tree(tn, &ret_tn); break; default: