From c1b44717e1db560e93cd9f5c4c7f3c9f57f34526 Mon Sep 17 00:00:00 2001
From: Curt Wohlgemuth <curtw@google.com>
Date: Mon, 20 Feb 2012 17:53:03 -0500
Subject: [PATCH] --- yaml --- r: 296541 b: refs/heads/master c:
 1592d2c5574edadb0871cc4ac84265bdd18b2d68 h: refs/heads/master i:   296539:
 56b2016acebda9c2b67a1ab72a45bf482fb09075 v: v3

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

diff --git a/[refs] b/[refs]
index bc7e6111a0e7..8240d371fe05 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c0e00e5ce0d23e3e0a93f99ae8e94398e32a2d2
+refs/heads/master: 1592d2c5574edadb0871cc4ac84265bdd18b2d68
diff --git a/trunk/fs/ext4/mballoc.c b/trunk/fs/ext4/mballoc.c
index 2e467718d413..8e01214a4421 100644
--- a/trunk/fs/ext4/mballoc.c
+++ b/trunk/fs/ext4/mballoc.c
@@ -2858,7 +2858,8 @@ ext4_mb_normalize_request(struct ext4_allocation_context *ac,
 	struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
 	int bsbits, max;
 	ext4_lblk_t end;
-	loff_t size, orig_size, start_off;
+	loff_t size, start_off;
+	loff_t orig_size __maybe_unused;
 	ext4_lblk_t start;
 	struct ext4_inode_info *ei = EXT4_I(ac->ac_inode);
 	struct ext4_prealloc_space *pa;