JFFS2: remove junk prototypes
Subsystems (2)
PATCH 1/2 JFFS2: remove junk prototypes
From: Artem Bityutskiy <[email protected]>
Subject: [PATCH] JFFS2: remove junk prototypes
'rb_prev()', 'rb_next()' and 'rb_replace_node()' are declared in include/linux/rbtree.h, no need for JFFS2 to re-declare them. I believe these are left-overs from the old days when the common RB tree code did not have those call and JFFS2 had private implementation.
--- fs/jffs2/nodelist.h | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-)
fs/jffs2/nodelist.h +0 -3
@@ -366,9 +366,6 @@ void jffs2_free_ino_caches(struct jffs2_sb_info *c);void jffs2_free_raw_node_refs (struct jffs2_sb_info *c);struct jffs2_node_frag *jffs2_lookup_node_frag (struct rb_root *fragtree,uint32_t offset);void jffs2_kill_fragtree (struct rb_root *root,struct jffs2_sb_info *c_delete); -struct rb_node *rb_next (struct rb_node *); -struct rb_node *rb_prev (struct rb_node *); -void rb_replace_node (struct rb_node *victim,struct rb_node *new,struct rb_root *root);int jffs2_add_full_dnode_to_inode (struct jffs2_sb_info *c,struct jffs2_inode_info *f,struct jffs2_full_dnode *fn);uint32_t jffs2_truncate_fragtree (struct jffs2_sb_info *c,struct rb_root *list,uint32_t size); struct jffs2_raw_node_ref *jffs2_link_node_ref(struct jffs2_sb_info *c,
Signature · 1 line
1.6.0.6
PATCH 2/2 rbtree: add const qualifier to some functions
Quoted 1 line
From
af4d3261cca8da5419f8e2e148a973ae31483a03Mon Sep 17 00:00:00 2001
From: Artem Bityutskiy <[email protected]>
Date: Thu, 8 Jan 2009 11:18:23 +0200
Subject: [PATCH] rbtree: add const qualifier to some functions
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
The 'rb_first()', 'rb_last()', 'rb_next()' and 'rb_prev()' calls take a pointer to an RB node or RB root. They do not change the pointed objects, so add a 'const' qualifier in order to make life of the users of these functions easier.
Indeed, if I have my own constant pointer &const struct my_type *p, and I call 'rb_next(&p->rb)', I get a GCC warning:
warning: passing argument 1 of ‘rb_next’ discards qualifiers from pointer target type
--- include/linux/rbtree.h | 8 ++++---- lib/rbtree.c | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-)
include/linux/rbtree.h +4 -4
@@ -140,10 +140,10 @@ extern void rb_insert_color(struct rb_node *, struct rb_root *);extern void rb_erase (struct rb_node *,struct rb_root *);/* Find logical next and previous nodes in a tree */ -extern struct rb_node *rb_next (struct rb_node *); -extern struct rb_node *rb_prev (struct rb_node *); -extern struct rb_node *rb_first (struct rb_root *); -extern struct rb_node *rb_last (struct rb_root *); +extern struct rb_node *rb_next (const struct rb_node *); +extern struct rb_node *rb_prev (const struct rb_node *); +extern struct rb_node *rb_first (const struct rb_root *); +extern struct rb_node *rb_last (const struct rb_root *);/* Fast replacement of a single node without remove/rebalance/add/rebalance */ extern void rb_replace_node(struct rb_node *victim, struct rb_node *new,
lib/rbtree.c +6 -6
@@ -292,7 +292,7 @@ EXPORT_SYMBOL(rb_erase);/* * This function returns the first node (in sort order) of the tree. */ -struct rb_node *rb_first (struct rb_root *root) +struct rb_node *rb_first (const struct rb_root *root) {struct rb_node *n;
@@ -305,7 +305,7 @@ struct rb_node *rb_first(struct rb_root *root) }EXPORT_SYMBOL (rb_first); -struct rb_node *rb_last (struct rb_root *root) +struct rb_node *rb_last (const struct rb_root *root) {struct rb_node *n;
@@ -318,7 +318,7 @@ struct rb_node *rb_last(struct rb_root *root) }EXPORT_SYMBOL (rb_last); -struct rb_node *rb_next (struct rb_node *node) +struct rb_node *rb_next (const struct rb_node *node) {struct rb_node *parent;
@@ -331,7 +331,7 @@ struct rb_node *rb_next(struct rb_node *node) node = node->rb_right;while (node->rb_left) node=node->rb_left; -return node; +return (struct rb_node *)node; }/* No right-hand children. Everything down and left is
@@ -347,7 +347,7 @@ struct rb_node *rb_next(struct rb_node *node) }EXPORT_SYMBOL (rb_next); -struct rb_node *rb_prev (struct rb_node *node) +struct rb_node *rb_prev (const struct rb_node *node) {struct rb_node *parent;
@@ -360,7 +360,7 @@ struct rb_node *rb_prev(struct rb_node *node) node = node->rb_left;while (node->rb_right) node=node->rb_right; -return node; +return (struct rb_node *)node; }/* No left-hand children. Go up till we find an ancestor which
Signature · 1 line
1.6.0.6
David Woodhouse
maintainerPATCH 1/1 rbtree: add const qualifier to some functions
In reply to Artem BityutskiyFrom: Artem Bityutskiy <[email protected]>
The 'rb_first()', 'rb_last()', 'rb_next()' and 'rb_prev()' calls take a pointer to an RB node or RB root. They do not change the pointed objects, so add a 'const' qualifier in order to make life of the users of these functions easier.
Indeed, if I have my own constant pointer &const struct my_type *p, and I call 'rb_next(&p->rb)', I get a GCC warning:
warning: passing argument 1 of ‘rb_next’ discards qualifiers from pointer target type
--- include/linux/rbtree.h | 8 ++++---- lib/rbtree.c | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-)
include/linux/rbtree.h +4 -4
@@ -140,10 +140,10 @@ extern void rb_insert_color(struct rb_node *, struct rb_root *);extern void rb_erase (struct rb_node *,struct rb_root *);/* Find logical next and previous nodes in a tree */ -extern struct rb_node *rb_next (struct rb_node *); -extern struct rb_node *rb_prev (struct rb_node *); -extern struct rb_node *rb_first (struct rb_root *); -extern struct rb_node *rb_last (struct rb_root *); +extern struct rb_node *rb_next (const struct rb_node *); +extern struct rb_node *rb_prev (const struct rb_node *); +extern struct rb_node *rb_first (const struct rb_root *); +extern struct rb_node *rb_last (const struct rb_root *);/* Fast replacement of a single node without remove/rebalance/add/rebalance */ extern void rb_replace_node(struct rb_node *victim, struct rb_node *new,
lib/rbtree.c +6 -6
@@ -292,7 +292,7 @@ EXPORT_SYMBOL(rb_erase);/* * This function returns the first node (in sort order) of the tree. */ -struct rb_node *rb_first (struct rb_root *root) +struct rb_node *rb_first (const struct rb_root *root) {struct rb_node *n;
@@ -305,7 +305,7 @@ struct rb_node *rb_first(struct rb_root *root) }EXPORT_SYMBOL (rb_first); -struct rb_node *rb_last (struct rb_root *root) +struct rb_node *rb_last (const struct rb_root *root) {struct rb_node *n;
@@ -318,7 +318,7 @@ struct rb_node *rb_last(struct rb_root *root) }EXPORT_SYMBOL (rb_last); -struct rb_node *rb_next (struct rb_node *node) +struct rb_node *rb_next (const struct rb_node *node) {struct rb_node *parent;
@@ -331,7 +331,7 @@ struct rb_node *rb_next(struct rb_node *node) node = node->rb_right;while (node->rb_left) node=node->rb_left; -return node; +return (struct rb_node *)node; }/* No right-hand children. Everything down and left is
@@ -347,7 +347,7 @@ struct rb_node *rb_next(struct rb_node *node) }EXPORT_SYMBOL (rb_next); -struct rb_node *rb_prev (struct rb_node *node) +struct rb_node *rb_prev (const struct rb_node *node) {struct rb_node *parent;
@@ -360,7 +360,7 @@ struct rb_node *rb_prev(struct rb_node *node) node = node->rb_left;while (node->rb_right) node=node->rb_right; -return node; +return (struct rb_node *)node; }/* No left-hand children. Go up till we find an ancestor which
Signature · 5 lines
1.6.0.6 -- David Woodhouse Open Source Technology Centre [email protected] Intel Corporation