diff --git a/[refs] b/[refs] index 54e4d6a2dc77..ec33a225d0ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 336d2ff7115bd4391108a16f476c739cb4a505b0 +refs/heads/master: 86ffc0d5f5f0c8a6fe70eccade3f7ae8e9630edf diff --git a/trunk/fs/jffs2/readinode.c b/trunk/fs/jffs2/readinode.c index 8f0be5557ae9..5b2a83599d73 100644 --- a/trunk/fs/jffs2/readinode.c +++ b/trunk/fs/jffs2/readinode.c @@ -7,7 +7,7 @@ * * For licensing information, see the file 'LICENCE' in this directory. * - * $Id: readinode.c,v 1.124 2005/07/07 15:45:29 dedekind Exp $ + * $Id: readinode.c,v 1.125 2005/07/10 13:13:55 dedekind Exp $ * */ @@ -558,7 +558,6 @@ static int jffs2_do_read_inode_internal(struct jffs2_sb_info *c, } next_tn: BUG_ON(rb->rb_left); - repl_rb = NULL; if (rb->rb_parent && rb->rb_parent->rb_left == rb) { /* We were then left-hand child of our parent. We need to move our own right-hand child into our place. */