iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

quota: Simplify dquot_resume()

Browse Source 
We already have quota inode loaded when resuming quotas. Use
vfs_load_quota() to avoid some pointless churn with the quota inode.

Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
Jan Kara 2019-11-01 17:51:05 +01:00
parent c7d3d28360
commit ae45f07d47
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/quota/dquot.c
View File

@ -2438,7 +2438,6 @@ static int vfs_load_quota_inode(struct inode *inode, int type, int format_id,
int dquot_resume(struct super_block *sb, int type) int dquot_resume(struct super_block *sb, int type)
{ {
struct quota_info *dqopt = sb_dqopt(sb); struct quota_info *dqopt = sb_dqopt(sb);
struct inode *inode;
int ret = 0, cnt; int ret = 0, cnt;
unsigned int flags; unsigned int flags;
@ -2452,8 +2451,6 @@ int dquot_resume(struct super_block *sb, int type)
if (!sb_has_quota_suspended(sb, cnt)) if (!sb_has_quota_suspended(sb, cnt))
continue; continue;
inode = dqopt->files[cnt];
dqopt->files[cnt] = NULL;
spin_lock(&dq_state_lock); spin_lock(&dq_state_lock);
flags = dqopt->flags & dquot_state_flag(DQUOT_USAGE_ENABLED | flags = dqopt->flags & dquot_state_flag(DQUOT_USAGE_ENABLED |
DQUOT_LIMITS_ENABLED, DQUOT_LIMITS_ENABLED,
@ -2462,9 +2459,10 @@ int dquot_resume(struct super_block *sb, int type)
spin_unlock(&dq_state_lock); spin_unlock(&dq_state_lock);
flags = dquot_generic_flag(flags, cnt); flags = dquot_generic_flag(flags, cnt);
ret = vfs_load_quota_inode(inode, cnt, ret = dquot_load_quota_sb(sb, cnt, dqopt->info[cnt].dqi_fmt_id,
dqopt->info[cnt].dqi_fmt_id, flags); flags);
iput(inode); if (ret < 0)
vfs_cleanup_quota_inode(sb, type);
} }
return ret; return ret;