diff options
| author | Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> | 2010-03-15 00:34:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-17 18:43:47 -0700 |
| commit | bcc54e2a6d8e93ff83ec398511930b0a73e19151 (patch) | |
| tree | 7a509499223f1698cafb30b869c4261ab20b2f8c /fs/jffs2 | |
| parent | e9e58a4ec3b1086d1ed8c915311aef1ae55454fd (diff) | |
| download | linux-3.10-bcc54e2a6d8e93ff83ec398511930b0a73e19151.tar.gz linux-3.10-bcc54e2a6d8e93ff83ec398511930b0a73e19151.tar.bz2 linux-3.10-bcc54e2a6d8e93ff83ec398511930b0a73e19151.zip | |
jffs2: fix up rb_root initializations to use RB_ROOT
jffs2 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 NULL as 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>
Acked-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/jffs2')
| -rw-r--r-- | fs/jffs2/readinode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jffs2/readinode.c b/fs/jffs2/readinode.c index e22de8397b7..d32ee9412cb 100644 --- a/fs/jffs2/readinode.c +++ b/fs/jffs2/readinode.c @@ -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) |