Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 1513b02c8b537af275ea74fdfb380c618b9e6778

Authored by Venkatesh Pallipadi
Committed by Jan Kara
1 parent 4dea496974
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

... ... @@ -297,7 +297,7 @@
297 297 kfree (old);
298 298 }
299 299 if (!parent)
300   - root->rb_node = NULL;
  300 + *root = RB_ROOT;
301 301 else if (parent->rb_left == n)
302 302 parent->rb_left = NULL;
303 303 else if (parent->rb_right == n)