]> www.infradead.org Git - users/hch/xfsprogs.git/commit
xfs_repair: don't call xfs_sb_quota_from_disk twice
authorEric Sandeen <sandeen@redhat.com>
Wed, 29 Jun 2016 01:13:09 +0000 (11:13 +1000)
committerDave Chinner <david@fromorbit.com>
Wed, 29 Jun 2016 01:13:09 +0000 (11:13 +1000)
commitee3754254e8c186c99b6cdd4d59f741759d04acb
treebb79506ea7326d9923f1d1c915aea024f05d109e
parentdd36660559fb3dcaf4c1ec0be2fbbce19404780b
xfs_repair: don't call xfs_sb_quota_from_disk twice

kernel commit 5ef828c4
xfs: avoid false quotacheck after unclean shutdown

made xfs_sb_from_disk() also call xfs_sb_quota_from_disk
by default.

However, when this was merged to libxfs, existing separate
calls to libxfs_sb_quota_from_disk remained, and calling it
twice in a row on a V4 superblock leads to issues, because:

        if (sbp->sb_qflags & XFS_PQUOTA_ACCT)  {
...
                sbp->sb_pquotino = sbp->sb_gquotino;
                sbp->sb_gquotino = NULLFSINO;

and after the second call, we have set both pquotino and gquotino
to NULLFSINO.

Fix this by making it safe to call twice, and also remove the extra
calls to libxfs_sb_quota_from_disk.

This is only spotted when running xfstests with "-m crc=0" because
the sb_from_disk change came about after V5 became default, and
the above behavior only exists on a V4 superblock.

Reported-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
libxfs/xfs_sb.c
repair/sb.c
repair/scan.c