Return-Path: Received: from mx2.suse.de ([195.135.220.15]:37543 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752204AbdHPPlh (ORCPT ); Wed, 16 Aug 2017 11:41:37 -0400 From: Jan Kara To: Cc: Wang Shilong , Jan Kara Subject: [PATCH 12/27] quota: Push dqio_sem down to ->get_next_id() Date: Wed, 16 Aug 2017 17:41:12 +0200 Message-Id: <20170816154127.7048-13-jack@suse.cz> In-Reply-To: <20170816154127.7048-1-jack@suse.cz> References: <20170816154127.7048-1-jack@suse.cz> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Push down acquisition of dqio_sem into ->get_next_id() callback. Mostly for consistency with other operations. Signed-off-by: Jan Kara --- fs/quota/dquot.c | 6 +----- fs/quota/quota_v2.c | 8 +++++++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c index 3b3c7f094ff8..332f7026edad 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c @@ -2067,16 +2067,12 @@ EXPORT_SYMBOL(dquot_commit_info); int dquot_get_next_id(struct super_block *sb, struct kqid *qid) { struct quota_info *dqopt = sb_dqopt(sb); - int err; if (!sb_has_quota_active(sb, qid->type)) return -ESRCH; if (!dqopt->ops[qid->type]->get_next_id) return -ENOSYS; - down_read(&dqopt->dqio_sem); - err = dqopt->ops[qid->type]->get_next_id(sb, qid); - up_read(&dqopt->dqio_sem); - return err; + return dqopt->ops[qid->type]->get_next_id(sb, qid); } EXPORT_SYMBOL(dquot_get_next_id); diff --git a/fs/quota/quota_v2.c b/fs/quota/quota_v2.c index 8f54b159e423..f82638e43c07 100644 --- a/fs/quota/quota_v2.c +++ b/fs/quota/quota_v2.c @@ -340,7 +340,13 @@ static int v2_free_file_info(struct super_block *sb, int type) static int v2_get_next_id(struct super_block *sb, struct kqid *qid) { - return qtree_get_next_id(sb_dqinfo(sb, qid->type)->dqi_priv, qid); + struct quota_info *dqopt = sb_dqopt(sb); + int ret; + + down_read(&dqopt->dqio_sem); + ret = qtree_get_next_id(sb_dqinfo(sb, qid->type)->dqi_priv, qid); + up_read(&dqopt->dqio_sem); + return ret; } static const struct quota_format_ops v2_format_ops = { -- 2.12.3