On Aug 16, 2017, at 9:41 AM, Jan Kara <jack@xxxxxxx> wrote:
>
> Push down acquisition of dqio_sem into ->read_dqblk() callback. It will
> allow quota formats to decide whether they need it or not.
>
> Signed-off-by: Jan Kara <jack@xxxxxxx>
Reviewed-by: Andreas Dilger <adilger@xxxxxxxxx>
> ---
> fs/quota/dquot.c | 5 +----
> fs/quota/quota_v1.c | 5 ++++-
> fs/quota/quota_v2.c | 10 +++++++++-
> 3 files changed, 14 insertions(+), 6 deletions(-)
>
> diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
> index 99693c6d5dae..70b9a6afe5a8 100644
> --- a/fs/quota/dquot.c
> +++ b/fs/quota/dquot.c
> @@ -403,11 +403,8 @@ int dquot_acquire(struct dquot *dquot)
> struct quota_info *dqopt = sb_dqopt(dquot->dq_sb);
>
> mutex_lock(&dquot->dq_lock);
> - if (!test_bit(DQ_READ_B, &dquot->dq_flags)) {
> - down_read(&dqopt->dqio_sem);
> + if (!test_bit(DQ_READ_B, &dquot->dq_flags))
> ret = dqopt->ops[dquot->dq_id.type]->read_dqblk(dquot);
> - up_read(&dqopt->dqio_sem);
> - }
> if (ret < 0)
> goto out_iolock;
> /* Make sure flags update is visible after dquot has been filled */
> diff --git a/fs/quota/quota_v1.c b/fs/quota/quota_v1.c
> index 8fe79beced5c..d534c4043237 100644
> --- a/fs/quota/quota_v1.c
> +++ b/fs/quota/quota_v1.c
> @@ -56,10 +56,12 @@ static int v1_read_dqblk(struct dquot *dquot)
> {
> int type = dquot->dq_id.type;
> struct v1_disk_dqblk dqblk;
> + struct quota_info *dqopt = sb_dqopt(dquot->dq_sb);
>
> - if (!sb_dqopt(dquot->dq_sb)->files[type])
> + if (!dqopt->files[type])
> return -EINVAL;
>
> + down_read(&dqopt->dqio_sem);
> /* Set structure to 0s in case read fails/is after end of file */
> memset(&dqblk, 0, sizeof(struct v1_disk_dqblk));
> dquot->dq_sb->s_op->quota_read(dquot->dq_sb, type, (char *)&dqblk,
> @@ -73,6 +75,7 @@ static int v1_read_dqblk(struct dquot *dquot)
> dquot->dq_dqb.dqb_isoftlimit == 0)
> set_bit(DQ_FAKE_B, &dquot->dq_flags);
> dqstats_inc(DQST_READS);
> + up_read(&dqopt->dqio_sem);
>
> return 0;
> }
> diff --git a/fs/quota/quota_v2.c b/fs/quota/quota_v2.c
> index ca71bf881ad1..b2cd34f6b3da 100644
> --- a/fs/quota/quota_v2.c
> +++ b/fs/quota/quota_v2.c
> @@ -285,7 +285,15 @@ static int v2r1_is_id(void *dp, struct dquot *dquot)
>
> static int v2_read_dquot(struct dquot *dquot)
> {
> - return qtree_read_dquot(sb_dqinfo(dquot->dq_sb, dquot->dq_id.type)->dqi_priv, dquot);
> + struct quota_info *dqopt = sb_dqopt(dquot->dq_sb);
> + int ret;
> +
> + down_read(&dqopt->dqio_sem);
> + ret = qtree_read_dquot(
> + sb_dqinfo(dquot->dq_sb, dquot->dq_id.type)->dqi_priv,
> + dquot);
> + up_read(&dqopt->dqio_sem);
> + return ret;
> }
>
> static int v2_write_dquot(struct dquot *dquot)
> --
> 2.12.3
>
Cheers, Andreas
Attachment:
signature.asc
Description: Message signed with OpenPGP
