---

yaml --- r: 229080 b: refs/heads/master c: ad692bf h: refs/heads/master v: v3
git-mirror · Jan 6, 2011 · 6d4f108 · 6d4f108
1 parent c4f04c4
commit 6d4f108
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fbcae8e32d73ad6cad9c5721881350c51174d552
+refs/heads/master: ad692bf3ea035fa5a9d56462cf3df97d9607cced
diff --git a/trunk/fs/ext3/super.c b/trunk/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;
 	}