git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt...
[pandora-kernel.git]
/
fs
/
ext3
/
dir.c
diff --git
a/fs/ext3/dir.c
b/fs/ext3/dir.c
index
373fa90
..
e2e72c3
100644
(file)
--- 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)