diff options
| author | Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> | 2010-05-25 10:03:04 -0400 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2010-05-27 11:39:36 -0400 |
| commit | 1513b02c8b537af275ea74fdfb380c618b9e6778 (patch) | |
| tree | 06ce2ca6599f14707bd873f5f2df4ab0455c0e10 /fs | |
| parent | 4dea496974e41814cc715db0268226c6f71f7c8a (diff) | |
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')
| -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 373fa90c796a..e2e72c367cf6 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) | |||
| 297 | kfree (old); | 297 | kfree (old); |
| 298 | } | 298 | } |
| 299 | if (!parent) | 299 | if (!parent) |
| 300 | root->rb_node = NULL; | 300 | *root = RB_ROOT; |
| 301 | else if (parent->rb_left == n) | 301 | else if (parent->rb_left == n) |
| 302 | parent->rb_left = NULL; | 302 | parent->rb_left = NULL; |
| 303 | else if (parent->rb_right == n) | 303 | else if (parent->rb_right == n) |