Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 1a5f2138788e473940e27f1101c2cba9902240f6

Authored by Jan Kara
Committed by Greg Kroah-Hartman
1 parent 171f992511

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

commit dfcc70a8c868fe03276fa59864149708fb41930b upstream.

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 14bf61ffe6ac (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.

Reported-by: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: Jan Kara <jack@suse.cz>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 5 additions and 0 deletions Side-by-side Diff

... ... @@ -844,6 +844,11 @@
844 844 */
845 845 xfs_dqcheck(mp, ddq, id+j, type, XFS_QMOPT_DQREPAIR,
846 846 "xfs_quotacheck");
  847 + /*
  848 + * Reset type in case we are reusing group quota file for
  849 + * project quotas or vice versa
  850 + */
  851 + ddq->d_flags = type;
847 852 ddq->d_bcount = 0;
848 853 ddq->d_icount = 0;
849 854 ddq->d_rtbcount = 0;