]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ext3: Return error code from generic_check_addressable
authorDarrick J. Wong <djwong@us.ibm.com>
Tue, 16 Nov 2010 22:57:44 +0000 (22:57 +0000)
committerJan Kara <jack@suse.cz>
Thu, 6 Jan 2011 10:52:15 +0000 (11:52 +0100)
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>
fs/ext3/super.c

index 0e9cbc37024a7933bc5483bc13974c51d61b2102..ebc3a9c77067d3b6a60cd869c1bd4922f85efca4 100644 (file)
@@ -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;
        }