From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759006Ab0KPW5r (ORCPT ); Tue, 16 Nov 2010 17:57:47 -0500 Received: from e2.ny.us.ibm.com ([32.97.182.142]:49243 "EHLO e2.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754840Ab0KPW5q (ORCPT ); Tue, 16 Nov 2010 17:57:46 -0500 Date: Tue, 16 Nov 2010 14:57:44 -0800 From: "Darrick J. Wong" To: "Theodore Ts'o" Cc: Lukas Czerner , Eric Sandeen , "Patrick J. LoPresti" , linux-kernel , linux-ext4 , Mingming Cao Subject: [PATCH] ext3: Return error code from generic_check_addressable Message-ID: <20101116225744.GD18195@tux1.beaverton.ibm.com> Reply-To: djwong@us.ibm.com References: <20101115214831.GA18195@tux1.beaverton.ibm.com> <4CE1AC38.9040201@redhat.com> <20101115230346.GB18195@tux1.beaverton.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.17+20080114 (2008-01-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ext3: Return error code from generic_check_accessible ext3_fill_super should return the error code that generic_check_accessible returns when an error condition occurs. Signed-off-by: Darrick J. Wong --- fs/ext3/super.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/ext3/super.c b/fs/ext3/super.c index 2fedaf8..960629b 100644 --- a/fs/ext3/super.c +++ b/fs/ext3/super.c @@ -1842,13 +1842,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; }