diff options
| author |   Jan Kara <jack@suse.cz> | 2019-11-01 17:51:05 +0100 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2019-11-04 09:58:05 +0100 |
| commit | ae45f07d47cc30e9170488a4e5fe91ba4fe5ed4e (patch) | |
| tree | a9407f235aa2756b0ad9c844ef1acac0ecf774d0 /fs/quota | |
| parent | quota: Factor out setup of quota inode (diff) | |
| download | linux-dev-ae45f07d47cc30e9170488a4e5fe91ba4fe5ed4e.tar.xz linux-dev-ae45f07d47cc30e9170488a4e5fe91ba4fe5ed4e.zip | |
quota: Simplify dquot_resume()
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>
Diffstat (limited to 'fs/quota')
| -rw-r--r-- | fs/quota/dquot.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c index 9e8eb6e71675..ecdae91029ed 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c @@ -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) { struct quota_info *dqopt = sb_dqopt(sb); - struct inode *inode; int ret = 0, cnt; unsigned int flags; @@ -2452,8 +2451,6 @@ int dquot_resume(struct super_block *sb, int type) if (!sb_has_quota_suspended(sb, cnt)) continue; - inode = dqopt->files[cnt]; - dqopt->files[cnt] = NULL; spin_lock(&dq_state_lock); flags = dqopt->flags & dquot_state_flag(DQUOT_USAGE_ENABLED | DQUOT_LIMITS_ENABLED, @@ -2462,9 +2459,10 @@ int dquot_resume(struct super_block *sb, int type) spin_unlock(&dq_state_lock); flags = dquot_generic_flag(flags, cnt); - ret = vfs_load_quota_inode(inode, cnt, - dqopt->info[cnt].dqi_fmt_id, flags); - iput(inode); + ret = dquot_load_quota_sb(sb, cnt, dqopt->info[cnt].dqi_fmt_id, + flags); + if (ret < 0) + vfs_cleanup_quota_inode(sb, type); } return ret; |