diff --git a/[refs] b/[refs]
index 182fc3c259f8..ee077e753d0d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a032a4df6dc4a82bcd1c401e57ee71825d30c14
+refs/heads/master: 2e16cfca6e17ae37ae21feca080a6f2eca9087dc
diff --git a/trunk/fs/jffs2/gc.c b/trunk/fs/jffs2/gc.c
index 090c556ffed2..3b6f2fa12cff 100644
--- a/trunk/fs/jffs2/gc.c
+++ b/trunk/fs/jffs2/gc.c
@@ -700,7 +700,8 @@ static int jffs2_garbage_collect_metadata(struct jffs2_sb_info *c, struct jffs2_
 	struct jffs2_raw_inode ri;
 	struct jffs2_node_frag *last_frag;
 	union jffs2_device_node dev;
-	char *mdata = NULL, mdatalen = 0;
+	char *mdata = NULL;
+	int mdatalen = 0;
 	uint32_t alloclen, ilen;
 	int ret;