diff --git a/[refs] b/[refs] index b67c674f8283..b97601d95957 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3db3a445308b3cee9bbbd8baa6d05081c9532da0 +refs/heads/master: 52b5108ca7490c0609e4dbddd8439bc03d702c99 diff --git a/trunk/fs/ext3/dir.c b/trunk/fs/ext3/dir.c index f37528ed222e..fbb0d4ed07d4 100644 --- a/trunk/fs/ext3/dir.c +++ b/trunk/fs/ext3/dir.c @@ -284,7 +284,7 @@ static void free_rb_tree_fname(struct rb_root *root) * beginning of the loop and try to free the parent * node. */ - parent = n->rb_parent; + parent = rb_parent(n); fname = rb_entry(n, struct fname, rb_hash); while (fname) { struct fname * old = fname;