From: Darrick J. Wong <djwong@us.ibm.com>
Date: Tue, 16 Nov 2010 22:57:44 +0000 (+0000)
Subject: ext3: Return error code from generic_check_addressable
X-Git-Tag: v2.6.38-rc1~410^2~13
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad692bf3ea035fa5a9d56462cf3df97d9607cced;p=pandora-kernel.git

ext3: Return error code from generic_check_addressable

ext3_fill_super should return the error code that generic_check_accessible
returns when an error condition occurs.

Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>
Signed-off-by: Jan Kara <jack@suse.cz>
---

diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 0e9cbc37024a..ebc3a9c77067 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -1859,13 +1859,15 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
 		goto failed_mount;
 	}
 
-	if (generic_check_addressable(sb->s_blocksize_bits,
-				      le32_to_cpu(es->s_blocks_count))) {
+	err = generic_check_addressable(sb->s_blocksize_bits,
+					le32_to_cpu(es->s_blocks_count));
+	if (err) {
 		ext3_msg(sb, KERN_ERR,
 			"error: filesystem is too large to mount safely");
 		if (sizeof(sector_t) < 8)
 			ext3_msg(sb, KERN_ERR,
 				"error: CONFIG_LBDAF not enabled");
+		ret = err;
 		goto failed_mount;
 	}