summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorDarrick J. Wong <djwong@us.ibm.com>2010-11-16 22:57:44 +0000
committerJan Kara <jack@suse.cz>2011-01-06 11:52:15 +0100
commitad692bf3ea035fa5a9d56462cf3df97d9607cced (patch)
treeb00660fc7d18ac241b24ce2bde4a80515cadfda0 /fs
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')
-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 0e9cbc37024..ebc3a9c7706 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;
}