diff options
| author | Jan Kara <jack@suse.cz> | 2017-06-09 08:36:16 +0200 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2017-08-17 19:05:16 +0200 |
| commit | f14618c6823ee0f9f92a87aad7d5ad26916ccff1 (patch) | |
| tree | 6cb1b9a685046e6bd0197952f8078d31c7b5f772 /fs | |
| parent | quota: Push dqio_sem down to ->release_dqblk() (diff) | |
| download | linux-f14618c6823ee0f9f92a87aad7d5ad26916ccff1.tar.xz linux-f14618c6823ee0f9f92a87aad7d5ad26916ccff1.zip | |
quota: Push dqio_sem down to ->get_next_id()
Push down acquisition of dqio_sem into ->get_next_id() callback. Mostly
for consistency with other operations.
Reviewed-by: Andreas Dilger <adilger@dilger.ca>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/quota/dquot.c | 6 | ||||
| -rw-r--r-- | 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 = { |