From patchwork Mon Feb 25 23:36:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kara X-Patchwork-Id: 223069 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 9DBA32C029A for ; Tue, 26 Feb 2013 10:36:23 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759744Ab3BYXgW (ORCPT ); Mon, 25 Feb 2013 18:36:22 -0500 Received: from cantor2.suse.de ([195.135.220.15]:46031 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759702Ab3BYXgW (ORCPT ); Mon, 25 Feb 2013 18:36:22 -0500 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 8F21FA50DE; Tue, 26 Feb 2013 00:36:21 +0100 (CET) Received: by quack.suse.cz (Postfix, from userid 1000) id 2C62A2067B; Tue, 26 Feb 2013 00:36:20 +0100 (CET) From: Jan Kara To: Ted Tso Cc: linux-ext4@vger.kernel.org, Jan Kara Subject: [PATCH 2/2] ext4: Enable quotas before orphan cleanup Date: Tue, 26 Feb 2013 00:36:09 +0100 Message-Id: <1361835369-19850-2-git-send-email-jack@suse.cz> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1361835369-19850-1-git-send-email-jack@suse.cz> References: <1361835369-19850-1-git-send-email-jack@suse.cz> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org When using quota feature we need to enable quotas before orphan cleanup so that changes happening during it are properly reflected in quota accounting. Signed-off-by: Jan Kara --- fs/ext4/super.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) This is based on Jeff Mahoney's patch to tear down kobj when quota init fails: ext4: cleanup sbi->s_kobj after quota initialization failure diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 1746a6e..ef1c69e 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -4001,6 +4001,16 @@ no_journal: if (err) goto failed_mount7; +#ifdef CONFIG_QUOTA + /* Enable quota usage during mount. */ + if (EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_QUOTA) && + !(sb->s_flags & MS_RDONLY)) { + err = ext4_enable_quotas(sb); + if (err) + goto failed_mount8; + } +#endif /* CONFIG_QUOTA */ + EXT4_SB(sb)->s_mount_state |= EXT4_ORPHAN_FS; ext4_orphan_cleanup(sb, es); EXT4_SB(sb)->s_mount_state &= ~EXT4_ORPHAN_FS; @@ -4018,16 +4028,6 @@ no_journal: } else descr = "out journal"; -#ifdef CONFIG_QUOTA - /* Enable quota usage during mount. */ - if (EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_QUOTA) && - !(sb->s_flags & MS_RDONLY)) { - err = ext4_enable_quotas(sb); - if (err) - goto failed_mount8; - } -#endif /* CONFIG_QUOTA */ - if (test_opt(sb, DISCARD)) { struct request_queue *q = bdev_get_queue(sb->s_bdev); if (!blk_queue_discard(q))