[Ocfs2-devel] [PATCH 1/2] quota: Handle Q_GETNEXTQUOTA when quota is disabled
Jan Kara
jack at suse.cz
Tue Mar 29 09:11:43 PDT 2016
Currently we oopsed when Q_GETNEXTQUOTA got called when quota was
disabled. Properly check whether quota is enabled for the filesystem
before calling into quota format handler.
Reported-by: Ted Tso <tytso at mit.edu>
Signed-off-by: Jan Kara <jack at suse.cz>
---
fs/quota/dquot.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
I have queue this fix for the bug Ted reported and will push it to Linus soon.
diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
index ba827daea5a0..ff21980d0119 100644
--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c
@@ -2047,11 +2047,20 @@ int dquot_get_next_id(struct super_block *sb, struct kqid *qid)
struct quota_info *dqopt = sb_dqopt(sb);
int err;
- if (!dqopt->ops[qid->type]->get_next_id)
- return -ENOSYS;
+ mutex_lock(&dqopt->dqonoff_mutex);
+ if (!sb_has_quota_active(sb, qid->type)) {
+ err = -ESRCH;
+ goto out;
+ }
+ if (!dqopt->ops[qid->type]->get_next_id) {
+ err = -ENOSYS;
+ goto out;
+ }
mutex_lock(&dqopt->dqio_mutex);
err = dqopt->ops[qid->type]->get_next_id(sb, qid);
mutex_unlock(&dqopt->dqio_mutex);
+out:
+ mutex_unlock(&dqopt->dqonoff_mutex);
return err;
}
--
2.6.2
More information about the Ocfs2-devel
mailing list