From a3241112584f91b4c9b340cf01bb9c61ba7a1dbc Mon Sep 17 00:00:00 2001
From: Carlos Maiolino <cmaiolino@redhat.com>
Date: Mon, 17 Sep 2012 23:39:12 -0400
Subject: [PATCH] --- yaml --- r: 331585 b: refs/heads/master c:
 90b0a97323f42ead278bbccbdf0e123db2add400 h: refs/heads/master i:   331583:
 6c7fb254fd282d1ba1d34b2fa3283eb7d22da331 v: v3

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

diff --git a/[refs] b/[refs]
index 4c198be4e620..ebef5b220756 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc0b75f77a944b482293972eb8fd5c88c576eb46
+refs/heads/master: 90b0a97323f42ead278bbccbdf0e123db2add400
diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c
index b4effbda7a96..ca76b5ed6c9e 100644
--- a/trunk/fs/ext4/inode.c
+++ b/trunk/fs/ext4/inode.c
@@ -732,11 +732,13 @@ struct buffer_head *ext4_getblk(handle_t *handle, struct inode *inode,
 	err = ext4_map_blocks(handle, inode, &map,
 			      create ? EXT4_GET_BLOCKS_CREATE : 0);
 
+	/* ensure we send some value back into *errp */
+	*errp = 0;
+
 	if (err < 0)
 		*errp = err;
 	if (err <= 0)
 		return NULL;
-	*errp = 0;
 
 	bh = sb_getblk(inode->i_sb, map.m_pblk);
 	if (!bh) {
diff --git a/trunk/fs/ext4/namei.c b/trunk/fs/ext4/namei.c
index 7450ff01c3c4..37c03b32e194 100644
--- a/trunk/fs/ext4/namei.c
+++ b/trunk/fs/ext4/namei.c
@@ -846,7 +846,7 @@ static int htree_dirblock_to_tree(struct file *dir_file,
 {
 	struct buffer_head *bh;
 	struct ext4_dir_entry_2 *de, *top;
-	int err, count = 0;
+	int err = 0, count = 0;
 
 	dxtrace(printk(KERN_INFO "In htree dirblock_to_tree: block %lu\n",
 							(unsigned long)block));