public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-05-15 04:06:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ocfs2: Fix Q_GETNEXTQUOTA for filesystem without quotas

Browse source 
When Q_GETNEXTQUOTA was called for filesystem with quotas disabled
ocfs2_get_next_id() oopses. Fix the problem by checking early whether
the filesystem has quotas enabled.

Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
Jan Kara 2016-03-29 17:44:11 +02:00
parent 17e8a8936c
commit 8f9e8f5fcc
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
fs/ocfs2/quota_global.c
View file

@ -867,6 +867,10 @@ static int ocfs2_get_next_id(struct super_block *sb, struct kqid *qid)
int status = 0; int status = 0;
trace_ocfs2_get_next_id(from_kqid(&init_user_ns, *qid), type); trace_ocfs2_get_next_id(from_kqid(&init_user_ns, *qid), type);
if (!sb_has_quota_loaded(sb, type)) {
status = -ESRCH;
goto out;
}
status = ocfs2_lock_global_qf(info, 0); status = ocfs2_lock_global_qf(info, 0);
if (status < 0) if (status < 0)
goto out; goto out;
@ -878,8 +882,11 @@ static int ocfs2_get_next_id(struct super_block *sb, struct kqid *qid)
out_global: out_global:
ocfs2_unlock_global_qf(info, 0); ocfs2_unlock_global_qf(info, 0);
out: out:
/* Avoid logging ENOENT since it just means there isn't next ID */ /*
if (status && status != -ENOENT) * Avoid logging ENOENT since it just means there isn't next ID and
* ESRCH which means quota isn't enabled for the filesystem.
*/
if (status && status != -ENOENT && status != -ESRCH)
mlog_errno(status); mlog_errno(status);
return status; return status;
} }