Fixup rb_root initializations to use RB_ROOT
Subsystems (2)
cover Fixup rb_root initializations to use RB_ROOT
Eric Paris found a problem with rb_root initializations and sent a patch to fix it here:
http://lkml.indiana.edu/hypermail/linux/kernel/1002.2/02946.html
btrfs: use RB_ROOT to intialize rb_trees instead of setting rb_node to NULL
Based on that, a simple grep for "rb_node = NULL" showed few more similar usages in ext3, ext4 and jffs2. Here are the patches to fix those root.rb_node = NULL
usages to
root = RB_ROOT
Compile tested.
PATCH 1/3 ext4: Fixup rb_root initializations to use RB_ROOT
ext4 uses rb_node = NULL; to zero rb_root at few places.
The problem with this is that 17d9ddc72fb8bba0d4f678 in the linux-next tree adds a new field to that struct which needs to be NULLas well. This patch uses RB_ROOT as the intializer so all of the relevant fields will be NULL'd.
--- fs/ext4/block_validity.c | 4 ++-- fs/ext4/dir.c | 2 +- fs/ext4/mballoc.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
fs/ext4/block_validity.c +2 -2
@@ -205,14 +205,14 @@ void ext4_release_system_zone(struct super_block *sb) entry = rb_entry(n, struct ext4_system_zone, node);kmem_cache_free (ext4_system_zone_cachep, entry);if (!parent) -EXT4_SB (sb)->system_blks.rb_node =NULL ; +EXT4_SB (sb)->system_blks =RB_ROOT ;else if (parent->rb_left == n) parent->rb_left =NULL ;else if (parent->rb_right == n) parent->rb_right =NULL ; n = parent; } -EXT4_SB (sb)->system_blks.rb_node =NULL ; +EXT4_SB (sb)->system_blks =RB_ROOT ; }/*
fs/ext4/dir.c +1 -1
@@ -303,7 +303,7 @@ static void free_rb_tree_fname(struct rb_root *root)kfree (old); }if (!parent) - root->rb_node =NULL ; + *root =RB_ROOT ;else if (parent->rb_left == n) parent->rb_left =NULL ;else if (parent->rb_right == n)
fs/ext4/mballoc.c +1 -1
@@ -2256,7 +2256,7 @@ int ext4_mb_add_groupinfo(struct super_block *sb, ext4_group_t group,INIT_LIST_HEAD (&meta_group_info[i]->bb_prealloc_list);init_rwsem (&meta_group_info[i]->alloc_sem); - meta_group_info[i]->bb_free_root.rb_node =NULL ; + meta_group_info[i]->bb_free_root =RB_ROOT ;#ifdef DOUBLE_CHECK {
Signature · 3 lines
1.6.0.6 --
Re: [patch 1/3] ext4: Fixup rb_root initializations to use RB_ROOT
Quoted 2 lines · On Tue, 23 Feb 2010 17:38:59 -0800 [email protected] wrote:
The problem with this is that
17d9ddc72fb8bba0d4f678in the linux-next tree
Please don't quote bare commit ID's in changelogs. Especially when it's a linux-next commit: linux-next gets rebuilt each day!
The preferred form is to quote the title as well:17d9ddc72fb8bba0d4f678 ("rbtree: Add support for augmented rbtrees")
PATCH 2/3 ext3: Fixup rb_root initializations to use RB_ROOT
In reply to [email protected]ext3 uses rb_node = NULL; to zero rb_root.
The problem with this is that 17d9ddc72fb8bba0d4f678 in the linux-next tree adds a new field to that struct which needs to be NULLas well. This patch uses RB_ROOT as the intializer so all of the relevant fields will be NULL'd.
--- fs/ext3/dir.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
fs/ext3/dir.c +1 -1
@@ -297,7 +297,7 @@ static void free_rb_tree_fname(struct rb_root *root)kfree (old); }if (!parent) - root->rb_node =NULL ; + *root =RB_ROOT ;else if (parent->rb_left == n) parent->rb_left =NULL ;else if (parent->rb_right == n)
Signature · 3 lines
1.6.0.6 --
PATCH 3/3 jffs2: Fixup rb_root initializations to use RB_ROOT
In reply to [email protected]jffs2 uses rb_node = NULL; to zero rb_root.
The problem with this is that 17d9ddc72fb8bba0d4f678 in the linux-next tree adds a new field to that struct which needs to be NULLas well. This patch uses RB_ROOT as the intializer so all of the relevant fields will be NULL'd.
--- fs/jffs2/readinode.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
fs/jffs2/readinode.c +1 -1
@@ -567,7 +567,7 @@ static void jffs2_free_tmp_dnode_info_list(struct rb_root *list)else BUG (); } } - list->rb_node =NULL ; + *list =RB_ROOT ; }static void jffs2_free_full_dirent_list (struct jffs2_full_dirent *fd)
Signature · 3 lines
1.6.0.6 --