Commit dfcc70a8 authored by Jan Kara's avatar Jan Kara Committed by Dave Chinner

xfs: Fix quota type in quota structures when reusing quota file

For filesystems without separate project quota inode field in the
superblock we just reuse project quota file for group quotas (and vice
versa) if project quota file is allocated and we need group quota file.
When we reuse the file, quota structures on disk suddenly have wrong
type stored in d_flags though. Nobody really cares about this (although
structure type reported to userspace was wrong as well) except
that after commit 14bf61ff (quota: Switch ->get_dqblk() and
->set_dqblk() to use bytes as space units) assertion in
xfs_qm_scall_getquota() started to trigger on xfs/106 test (apparently I
was testing without XFS_DEBUG so I didn't notice when submitting the
above commit).

Fix the problem by properly resetting ddq->d_flags when running quotacheck
for a quota file.

CC: [email protected]
Reported-by: default avatarAl Viro <[email protected]>
Signed-off-by: default avatarJan Kara <[email protected]>
Reviewed-by: default avatarDave Chinner <[email protected]>
Signed-off-by: default avatarDave Chinner <[email protected]>
parent c517d838
...@@ -836,6 +836,11 @@ xfs_qm_reset_dqcounts( ...@@ -836,6 +836,11 @@ xfs_qm_reset_dqcounts(
*/ */
xfs_dqcheck(mp, ddq, id+j, type, XFS_QMOPT_DQREPAIR, xfs_dqcheck(mp, ddq, id+j, type, XFS_QMOPT_DQREPAIR,
"xfs_quotacheck"); "xfs_quotacheck");
/*
* Reset type in case we are reusing group quota file for
* project quotas or vice versa
*/
ddq->d_flags = type;
ddq->d_bcount = 0; ddq->d_bcount = 0;
ddq->d_icount = 0; ddq->d_icount = 0;
ddq->d_rtbcount = 0; ddq->d_rtbcount = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment