diff options
| author | Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> | 2010-05-25 16:03:04 +0200 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2010-05-27 17:39:36 +0200 |
| commit | 1513b02c8b537af275ea74fdfb380c618b9e6778 (patch) | |
| tree | 06ce2ca6599f14707bd873f5f2df4ab0455c0e10 /fs/ext3/dir.c | |
| parent | 4dea496974e41814cc715db0268226c6f71f7c8a (diff) | |
| download | linux-3.10-1513b02c8b537af275ea74fdfb380c618b9e6778.tar.gz linux-3.10-1513b02c8b537af275ea74fdfb380c618b9e6778.tar.bz2 linux-3.10-1513b02c8b537af275ea74fdfb380c618b9e6778.zip | |
ext3 uses rb_node = NULL; to zero rb_root.
The problem with this is that 17d9ddc72fb8bba0d4f678 ("rbtree: Add support
for augmented rbtrees") 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.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Cc: Eric Paris <eparis@redhat.com>
Cc: Jan Kara <jack@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/ext3/dir.c')
| -rw-r--r-- | fs/ext3/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext3/dir.c b/fs/ext3/dir.c index 373fa90c796..e2e72c367cf 100644 --- a/fs/ext3/dir.c +++ b/fs/ext3/dir.c @@ -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) |