diff options
| author | Jan Kara <jack@suse.cz> | 2016-11-23 15:52:19 +0300 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2016-11-30 10:37:11 +0300 |
| commit | ee1ac541a2446b13b2525929e719e84b63d5e5da (patch) | |
| tree | ac26195119711bba13700d98e5d2decdae32cfae /fs/quota | |
| parent | 2a64f80ee3ab47dc0114e077ea27903c97882138 (diff) | |
| download | linux-ee1ac541a2446b13b2525929e719e84b63d5e5da.tar.xz | |
quota: Remove dqonoff_mutex from dquot_scan_active()
All callers of dquot_scan_active() now hold s_umount so we can rely on
that lock to protect us against quota state changes.
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/quota')
| -rw-r--r-- | fs/quota/dquot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c index 2a9dc3fb491c..d91aecc939c9 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c @@ -572,7 +572,8 @@ int dquot_scan_active(struct super_block *sb, struct dquot *dquot, *old_dquot = NULL; int ret = 0; - mutex_lock(&sb_dqopt(sb)->dqonoff_mutex); + WARN_ON_ONCE(!rwsem_is_locked(&sb->s_umount)); + spin_lock(&dq_list_lock); list_for_each_entry(dquot, &inuse_list, dq_inuse) { if (!test_bit(DQ_ACTIVE_B, &dquot->dq_flags)) @@ -603,7 +604,6 @@ int dquot_scan_active(struct super_block *sb, spin_unlock(&dq_list_lock); out: dqput(old_dquot); - mutex_unlock(&sb_dqopt(sb)->dqonoff_mutex); return ret; } EXPORT_SYMBOL(dquot_scan_active); |