From patchwork Tue Jul 10 01:48:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aditya Kali X-Patchwork-Id: 170016 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D7A1B2C020A for ; Tue, 10 Jul 2012 11:48:30 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752395Ab2GJBs0 (ORCPT ); Mon, 9 Jul 2012 21:48:26 -0400 Received: from mail-lb0-f174.google.com ([209.85.217.174]:61724 "EHLO mail-lb0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752084Ab2GJBsY (ORCPT ); Mon, 9 Jul 2012 21:48:24 -0400 Received: by lbbgm6 with SMTP id gm6so21278320lbb.19 for ; Mon, 09 Jul 2012 18:48:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:x-system-of-record; bh=Fi9/AqSP3gYGXB+xY2zBLZ7NLslTGxDgyh431AqmrtA=; b=lQo4IMiFekxxir6kMpTb+coYRQszWYGYYGRJ9UXcjgpLOw9pExNofyRFv0SdpvQZFM QaA9wtFS40svQfAVmG4ZDzcKAVHVm2fyctbIUCnALN2hlY6Yc9boS45DqBaAUhOrr+gZ FWYWlRucOCaz26gRwf4JWQDu0whfFuglNrY2cYInvmyWJbjxXVVnnFMKm++qzccGqaiZ YNacPBErl8Ez3ced2fZwhbMRWOdjRuNyYA0+rZWaI9NuIT0Xzo1HHnqBu9TVt0DcOmfw 5N1rBL0cIWM9gxgXX0mQx+tWtUIGGaHKxT/ugVuUARoNDMlkfpiwl7dztba01b/vFRlA MD6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:x-system-of-record:x-gm-message-state; bh=Fi9/AqSP3gYGXB+xY2zBLZ7NLslTGxDgyh431AqmrtA=; b=n6SMVORzLl7jQNoYVSTT1HzwyWgXBr6d+GpMPmmmHsVeVdYfNrfHUrkpt4pJ/4UQM3 bOD60dXIs/VIV6blqv06VPylNxPLXApus13lvdsz60LegQJu7oV0jKyCKVXwFeJva+Iu kDRq7ekIoEem0pAXZfK3PXu8PinzGnNOEfJRoF3JQu9d1S+FF0Va87dGKA/OfQVycsm9 ISQo7ZhtbJ/x80rqxn6NqeQdO4nFfTF4KA85FKwxVY6W1sZRLnoLQDEkEe6ocmBGs0Dl VFyoJxaSwmBU47fxZOZFTuO7ftuhL0IwPoROUPAmyZBPrhwvNoK2Rbqpzfj3vBQQHEaA ZrUQ== Received: by 10.152.136.18 with SMTP id pw18mr42736773lab.17.1341884902755; Mon, 09 Jul 2012 18:48:22 -0700 (PDT) Received: by 10.152.136.18 with SMTP id pw18mr42736759lab.17.1341884902643; Mon, 09 Jul 2012 18:48:22 -0700 (PDT) MIME-Version: 1.0 Received: by 10.112.39.6 with HTTP; Mon, 9 Jul 2012 18:48:02 -0700 (PDT) In-Reply-To: <20120710112312.099a2f602cd6aea90226732c@canb.auug.org.au> References: <20120710112312.099a2f602cd6aea90226732c@canb.auug.org.au> From: Aditya Kali Date: Mon, 9 Jul 2012 18:48:02 -0700 Message-ID: Subject: Re: linux-next: build failure after merge of the ext4 tree To: Stephen Rothwell , wfg@linux.intel.com Cc: "Theodore Ts'o" , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jan Kara , Johann Lombardi , ext4 development , kernel-janitors@vger.kernel.org X-System-Of-Record: true X-Gm-Message-State: ALoCoQlXINvNEeLvPyJHCy4KsqF/i2lmYQTQWFRLKb3duP5+ieX6/8LGAjqKUWxno6t98/9buy6WYL3DqNKn8Jp0KEvBsI9sRQusrGoacJS0F/+YPnQ1jii/O4ac+u+OvTTHREnPCoB8kCKUznvicPAHCf1oH2a4U+EUoxKX2BnKW0PcAUrvsZH7fLb/sQxVMgvK8m1HiBUc Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Sorry for the trouble. The following patch should fix the build. From: Aditya Kali Date: Mon, 9 Jul 2012 18:42:28 -0700 Subject: [PATCH] ext4: Fix compilation error for ext4_enable_quotas ext4_enable_quotas should only be called under CONFIG_QUOTA block. Signed-off-by: Aditya Kali --- fs/ext4/super.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) err = ext4_enable_quotas(sb); @@ -4742,6 +4743,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) goto restore_opts; } } +#endif } ext4_msg(sb, KERN_INFO, "re-mounted. Opts: %s", orig_data); diff --git a/fs/ext4/super.c b/fs/ext4/super.c index a9b87c3..e4b79fc 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -4734,6 +4734,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) if (enable_quota) { if (sb_any_quota_suspended(sb)) dquot_resume(sb, -1); +#ifdef CONFIG_QUOTA else if (EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_QUOTA)) {