From acd08c9571609f222844599b8366814b9446404b Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Mon, 19 Dec 2016 14:01:39 +0100 Subject: [PATCH] quota: Fix bogus warning in dquot_disable() dquot_disable() was warning when sb_has_quota_loaded() was true when invalidating page cache for quota files. The thinking behind this warning was that we must have raced with somebody else turning quotas on and this should not happen because all places modifying quota state must hold s_umount exclusively now. However sb_has_quota_loaded() can be also true at this point when we are just suspending quotas on remount read-only. Just restore the behavior to situation before commit 5ee64b71d466 ("quota: Remove dqonoff_mutex") which introduced the warning. The code in dquot_disable() can be further simplified with the new locking of quota state changes however let's leave that to a separate commit that can get more testing exposure. Fixes: 5ee64b71d46674baa8c0ce45ace72a4e566f9c97 Signed-off-by: Jan Kara --- fs/quota/dquot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c index 550f78f2b7c7a..1ed5494aa773f 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c @@ -2184,8 +2184,8 @@ int dquot_disable(struct super_block *sb, int type, unsigned int flags) * must also discard the blockdev buffers so that we see the * changes done by userspace on the next quotaon() */ for (cnt = 0; cnt < MAXQUOTAS; cnt++) - if (toputinode[cnt]) { - WARN_ON_ONCE(sb_has_quota_loaded(sb, cnt)); + /* This can happen when suspending quotas on remount-ro... */ + if (toputinode[cnt] && !sb_has_quota_loaded(sb, cnt)) { inode_lock(toputinode[cnt]); toputinode[cnt]->i_flags &= ~(S_IMMUTABLE | S_NOATIME | S_NOQUOTA); -- 2.39.5