aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext3
diff options
context:
space:
mode:
authorDarrick J. Wong <djwong@us.ibm.com>2010-11-16 17:57:44 -0500
committerJan Kara <jack@suse.cz>2011-01-06 05:52:15 -0500
commitad692bf3ea035fa5a9d56462cf3df97d9607cced (patch)
treeb00660fc7d18ac241b24ce2bde4a80515cadfda0 /fs/ext3
parentfbcae8e32d73ad6cad9c5721881350c51174d552 (diff)
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>
Diffstat (limited to 'fs/ext3')
-rw-r--r--fs/ext3/super.c6
1 files changed, 4 insertions, 2 deletions
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)
1859 goto failed_mount; 1859 goto failed_mount;
1860 } 1860 }
1861 1861
1862 if (generic_check_addressable(sb->s_blocksize_bits, 1862 err = generic_check_addressable(sb->s_blocksize_bits,
1863 le32_to_cpu(es->s_blocks_count))) { 1863 le32_to_cpu(es->s_blocks_count));
1864 if (err) {
1864 ext3_msg(sb, KERN_ERR, 1865 ext3_msg(sb, KERN_ERR,
1865 "error: filesystem is too large to mount safely"); 1866 "error: filesystem is too large to mount safely");
1866 if (sizeof(sector_t) < 8) 1867 if (sizeof(sector_t) < 8)
1867 ext3_msg(sb, KERN_ERR, 1868 ext3_msg(sb, KERN_ERR,
1868 "error: CONFIG_LBDAF not enabled"); 1869 "error: CONFIG_LBDAF not enabled");
1870 ret = err;
1869 goto failed_mount; 1871 goto failed_mount;
1870 } 1872 }
1871 1873