From 42fdb8583d5a7eaf916c7323fce6cb4728f364c4 Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Fri, 9 Jun 2017 08:59:46 +0200 Subject: quota: Push dqio_sem down to ->read_file_info() Push down acquisition of dqio_sem into ->read_file_info() callback. This is for consistency with other operations and it also allows us to get rid of an ugliness in OCFS2. Reviewed-by: Andreas Dilger Signed-off-by: Jan Kara --- fs/ocfs2/quota_local.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'fs/ocfs2') diff --git a/fs/ocfs2/quota_local.c b/fs/ocfs2/quota_local.c index 1829f6a..2eeedcc 100644 --- a/fs/ocfs2/quota_local.c +++ b/fs/ocfs2/quota_local.c @@ -691,9 +691,6 @@ static int ocfs2_local_read_info(struct super_block *sb, int type) struct ocfs2_quota_recovery *rec; int locked = 0; - /* We don't need the lock and we have to acquire quota file locks - * which will later depend on this lock */ - up_read(&sb_dqopt(sb)->dqio_sem); info->dqi_max_spc_limit = 0x7fffffffffffffffLL; info->dqi_max_ino_limit = 0x7fffffffffffffffLL; oinfo = kmalloc(sizeof(struct ocfs2_mem_dqinfo), GFP_NOFS); @@ -772,7 +769,6 @@ static int ocfs2_local_read_info(struct super_block *sb, int type) goto out_err; } - down_read(&sb_dqopt(sb)->dqio_sem); return 0; out_err: if (oinfo) { @@ -786,7 +782,6 @@ out_err: kfree(oinfo); } brelse(bh); - down_read(&sb_dqopt(sb)->dqio_sem); return -1; } -- cgit v1.1