From patchwork Tue Sep 15 09:02:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Dongsheng X-Patchwork-Id: 7182751 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 6CFF0BEEC1 for ; Tue, 15 Sep 2015 09:37:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6D08A20529 for ; Tue, 15 Sep 2015 09:37:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4FD8720647 for ; Tue, 15 Sep 2015 09:37:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754960AbbIOJhA (ORCPT ); Tue, 15 Sep 2015 05:37:00 -0400 Received: from cn.fujitsu.com ([59.151.112.132]:41721 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1754127AbbIOJJR (ORCPT ); Tue, 15 Sep 2015 05:09:17 -0400 X-IronPort-AV: E=Sophos;i="5.15,520,1432569600"; d="scan'208";a="100730373" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 15 Sep 2015 17:12:06 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id t8F98wSf008039; Tue, 15 Sep 2015 17:08:59 +0800 Received: from yds-PC.g08.fujitsu.local (10.167.226.66) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Tue, 15 Sep 2015 17:09:13 +0800 From: Dongsheng Yang To: , , , CC: , , Dongsheng Yang Subject: [PATCH v3 15/39] fs: quota: introduce a callback of restore_iflags to quotactl_ops Date: Tue, 15 Sep 2015 17:02:10 +0800 Message-ID: <1442307754-13233-16-git-send-email-yangds.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: <1442307754-13233-1-git-send-email-yangds.fnst@cn.fujitsu.com> References: <1442307754-13233-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=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 In dquot_disable, we need to restore the iflags of quota files and mark the inodes to dirty. But that's pain to file-systems working in out-place-updating way, such as btrfs and ubifs. when they are going to update inode, they have to reserve space for this inode. So we can not mark_inode_dirty() in dquot_disable for them. To solve this kind of problem, the common solution is introduce a callback to allow file-systems to do the inode_dirty work by themselves, the similar way with update_time(). Signed-off-by: Dongsheng Yang --- fs/quota/dquot.c | 51 ++++++++++++++++++++++++++++++++++----------------- include/linux/quota.h | 4 ++++ 2 files changed, 38 insertions(+), 17 deletions(-) diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c index c73f44d..3f08e69 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c @@ -2020,6 +2020,33 @@ int dquot_file_open(struct inode *inode, struct file *file) } EXPORT_SYMBOL(dquot_file_open); +static int generic_restore_iflags(struct super_block *sb, struct inode **toputinode, + unsigned int *old_flags) +{ + int cnt = 0; + struct quota_info *dqopt = sb_dqopt(sb); + + for (cnt = 0; cnt < MAXQUOTAS; cnt++) + if (toputinode[cnt]) { + mutex_lock(&dqopt->dqonoff_mutex); + /* If quota was reenabled in the meantime, we have + * nothing to do */ + if (!sb_has_quota_loaded(sb, cnt)) { + mutex_lock(&toputinode[cnt]->i_mutex); + toputinode[cnt]->i_flags &= ~(S_IMMUTABLE | + S_NOATIME | S_NOQUOTA); + toputinode[cnt]->i_flags |= old_flags[cnt]; + truncate_inode_pages(&toputinode[cnt]->i_data, + 0); + mutex_unlock(&toputinode[cnt]->i_mutex); + mark_inode_dirty_sync(toputinode[cnt]); + } + mutex_unlock(&dqopt->dqonoff_mutex); + } + + return 0; +} + /* * Turn quota off on a device. type == -1 ==> quotaoff for all types (umount) */ @@ -2028,6 +2055,7 @@ int dquot_disable(struct super_block *sb, int type, unsigned int flags) int cnt, ret = 0; struct quota_info *dqopt = sb_dqopt(sb); struct inode *toputinode[MAXQUOTAS]; + unsigned int *old_flags = dqopt->old_flags; /* Cannot turn off usage accounting without turning off limits, or * suspend quotas and simultaneously turn quotas off. */ @@ -2111,28 +2139,17 @@ int dquot_disable(struct super_block *sb, int type, unsigned int flags) * disk (and so userspace sees correct data afterwards). */ sync_filesystem(sb); sync_blockdev(sb->s_bdev); + /* Now the quota files are just ordinary files and we can set the * inode flags back. Moreover we discard the pagecache so that * userspace sees the writes we did bypassing the pagecache. We * must also discard the blockdev buffers so that we see the * changes done by userspace on the next quotaon() */ - for (cnt = 0; cnt < MAXQUOTAS; cnt++) - if (toputinode[cnt]) { - mutex_lock(&dqopt->dqonoff_mutex); - /* If quota was reenabled in the meantime, we have - * nothing to do */ - if (!sb_has_quota_loaded(sb, cnt)) { - mutex_lock(&toputinode[cnt]->i_mutex); - toputinode[cnt]->i_flags &= ~(S_IMMUTABLE | - S_NOATIME | S_NOQUOTA); - toputinode[cnt]->i_flags |= dqopt->old_flags[cnt]; - truncate_inode_pages(&toputinode[cnt]->i_data, - 0); - mutex_unlock(&toputinode[cnt]->i_mutex); - mark_inode_dirty_sync(toputinode[cnt]); - } - mutex_unlock(&dqopt->dqonoff_mutex); - } + if (sb->s_qcop->restore_iflags) + ret = sb->s_qcop->restore_iflags(sb, toputinode, old_flags); + else + ret = generic_restore_iflags(sb, toputinode, old_flags); + if (sb->s_bdev) invalidate_bdev(sb->s_bdev); put_inodes: diff --git a/include/linux/quota.h b/include/linux/quota.h index fcfee5a..64e52e4 100644 --- a/include/linux/quota.h +++ b/include/linux/quota.h @@ -428,6 +428,10 @@ struct quotactl_ops { int (*set_dqblk)(struct super_block *, struct kqid, struct qc_dqblk *); int (*get_state)(struct super_block *, struct qc_state *); int (*rm_xquota)(struct super_block *, unsigned int); + /* + * used in quota_disable to restore the i_flags of quota files. + */ + int (*restore_iflags)(struct super_block *sb, struct inode **, unsigned int *); }; struct quota_format_type {