From 31695e123c373e7171c57d54b6063d2b1b4d234b Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Wed, 26 Oct 2011 03:42:36 -0400
Subject: [PATCH] --- yaml --- r: 273155 b: refs/heads/master c:
 f85b287a01237857a50c93868231f7e831581a27 h: refs/heads/master i:   273153:
 8cccbf9b22f590b518f8d0441aef7219522788fa   273151:
 0c2669f67742e981f13947241fe644836c0d4f74 v: v3

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

diff --git a/[refs] b/[refs]
index f9492d8ffa03..abb4177c3b60 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 665436175c3ca9d35f135e1ba6bdd63745cff08a
+refs/heads/master: f85b287a01237857a50c93868231f7e831581a27
diff --git a/trunk/fs/ext4/extents.c b/trunk/fs/ext4/extents.c
index 8686eb756b38..02a4d80573a1 100644
--- a/trunk/fs/ext4/extents.c
+++ b/trunk/fs/ext4/extents.c
@@ -2928,7 +2928,8 @@ static int ext4_ext_convert_to_initialized(handle_t *handle,
 	struct ext4_extent zero_ex;
 	struct ext4_extent *ex;
 	ext4_lblk_t ee_block, eof_block;
-	unsigned int allocated, ee_len, depth;
+	unsigned int ee_len, depth;
+	int allocated;
 	int err = 0;
 	int split_flag = 0;