diff options
| author | Jan Kara <jack@suse.cz> | 2017-06-09 08:59:46 +0200 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2017-08-17 19:16:24 +0200 |
| commit | 42fdb8583d5a7eaf916c7323fce6cb4728f364c4 (patch) | |
| tree | ab56d2a8a3735eb3e94c35cf834050ab54851e4b /fs/quota/dquot.c | |
| parent | 9a8ae30e73cb8827dd0a8ae5fd505db457cfb7ed (diff) | |
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 <adilger@dilger.ca>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/quota/dquot.c')
| -rw-r--r-- | fs/quota/dquot.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c index 1e1ff97098ec..5e77c4da69a6 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c @@ -2313,15 +2313,11 @@ static int vfs_load_quota_inode(struct inode *inode, int type, int format_id, dqopt->info[type].dqi_format = fmt; dqopt->info[type].dqi_fmt_id = format_id; INIT_LIST_HEAD(&dqopt->info[type].dqi_dirty_list); - down_read(&dqopt->dqio_sem); error = dqopt->ops[type]->read_file_info(sb, type); - if (error < 0) { - up_read(&dqopt->dqio_sem); + if (error < 0) goto out_file_init; - } if (dqopt->flags & DQUOT_QUOTA_SYS_FILE) dqopt->info[type].dqi_flags |= DQF_SYS_FILE; - up_read(&dqopt->dqio_sem); spin_lock(&dq_state_lock); dqopt->flags |= dquot_state_flag(flags, type); spin_unlock(&dq_state_lock); |