diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-06-08 14:40:08 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-06-08 14:40:08 -0400 |
| commit | 76962be8491b18ae7ff4fd6a4accd398bdb402a2 (patch) | |
| tree | 976958bf8e4989a69901bfbb25dd6463728c6cb5 /fs/ext3/dir.c | |
| parent | 5e27fb78df95e027723af2c90ecc9b4527ae59e9 (diff) | |
| parent | d30e5d897c3da7c2d17c8112331b66ed953eec78 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
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 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) |