diff --git a/[refs] b/[refs]
index 3099b800fafe..6fc4c0cbf7f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf66737ca85c41442e99c9d380eb7807d88bac1f
+refs/heads/master: 25dc30b4cd68df1de8932fe77ca574227d42a259
diff --git a/trunk/fs/jffs2/gc.c b/trunk/fs/jffs2/gc.c
index 32ff0373aa04..59aeb9820435 100644
--- a/trunk/fs/jffs2/gc.c
+++ b/trunk/fs/jffs2/gc.c
@@ -1081,7 +1081,7 @@ static int jffs2_garbage_collect_hole(struct jffs2_sb_info *c, struct jffs2_eras
 	return 0;
 }
 
-static int jffs2_garbage_collect_dnode(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb,
+static int jffs2_garbage_collect_dnode(struct jffs2_sb_info *c, struct jffs2_eraseblock *orig_jeb,
 				       struct jffs2_inode_info *f, struct jffs2_full_dnode *fn,
 				       uint32_t start, uint32_t end)
 {