From 05c2ccc617b27d4ce913b4f5cb75b159c63df9fe Mon Sep 17 00:00:00 2001
From: David Woodhouse <David.Woodhouse@intel.com>
Date: Wed, 16 Dec 2009 03:27:20 +0000
Subject: [PATCH] --- yaml --- r: 176997 b: refs/heads/master c:
 2e16cfca6e17ae37ae21feca080a6f2eca9087dc h: refs/heads/master i:   176995:
 82564eebdc85a799d2206fbebd59cafb409c7dd6 v: v3

---
 [refs]              | 2 +-
 trunk/fs/jffs2/gc.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

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;