From patchwork Tue Jul 21 08:37:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Dongsheng X-Patchwork-Id: 6833311 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A59D7C05AC for ; Tue, 21 Jul 2015 08:44:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CCA1420678 for ; Tue, 21 Jul 2015 08:44:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DBA3E20690 for ; Tue, 21 Jul 2015 08:44:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753622AbbGUIny (ORCPT ); Tue, 21 Jul 2015 04:43:54 -0400 Received: from cn.fujitsu.com ([59.151.112.132]:57008 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1754172AbbGUInv (ORCPT ); Tue, 21 Jul 2015 04:43:51 -0400 X-IronPort-AV: E=Sophos;i="5.13,665,1427731200"; d="scan'208";a="98671214" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 21 Jul 2015 16:47:24 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id t6L8fsSN005041; Tue, 21 Jul 2015 16:41:54 +0800 Received: from yds-PC.g08.fujitsu.local (10.167.226.66) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Tue, 21 Jul 2015 16:43:41 +0800 From: Dongsheng Yang To: , , CC: , , Dongsheng Yang Subject: [PATCH 15/25] ubifs: disable quota in ubifs_put_super Date: Tue, 21 Jul 2015 16:37:46 +0800 Message-ID: <1437467876-22106-16-git-send-email-yangds.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: <1437467876-22106-1-git-send-email-yangds.fnst@cn.fujitsu.com> References: <1437467876-22106-1-git-send-email-yangds.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.66] Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We need to disable quota in umounting ubifs. So we have to disable quota in ubifs_put_super(). But quota disable will write quota file, and we have to budget for it. Signed-off-by: Dongsheng Yang --- fs/ubifs/super.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index 4e60330..e53cd40 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -2003,6 +2003,34 @@ static void ubifs_put_super(struct super_block *sb) ubifs_msg(c, "un-mount UBI device %d", c->vi.ubi_num); + if (!c->ro_mount) { + struct quota_info *dqopt = sb_dqopt(sb); + struct inode *inodes[MAXQUOTAS] = {}; + struct inode *tmp = NULL; + struct ubifs_inode *ui = NULL; + struct ubifs_budget_req req = {}; + int cnt = 0; + int index = 0; + + for (cnt = 0; cnt < MAXQUOTAS; cnt++) { + if (!sb_has_quota_loaded(sb, cnt)) + continue; + req.dirtied_ino += 1; + inodes[index++] = dqopt->files[cnt]; + } + ubifs_budget_space(c, &req); + + for (cnt = 0; cnt < MAXQUOTAS; cnt++) { + tmp = inodes[cnt]; + if (!tmp) + break; + ui = ubifs_inode(tmp); + mutex_lock(&ui->ui_mutex); + ui->budgeted = 1; + mutex_unlock(&ui->ui_mutex); + } + dquot_disable(sb, -1, DQUOT_USAGE_ENABLED | DQUOT_LIMITS_ENABLED); + } /* * The following asserts are only valid if there has not been a failure * of the media. For example, there will be dirty inodes if we failed