• Eric Sandeen's avatar
    xfs: don't call xfs_sb_quota_from_disk twice · e6fc6fcf
    Eric Sandeen authored
    Source xfsprogs commit: ee3754254e8c186c99b6cdd4d59f741759d04acb
    
    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: default avatarEryu Guan <eguan@redhat.com>
    Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
    Reviewed-by: default avatarCarlos Maiolino <cmaiolino@redhat.com>
    Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
    e6fc6fcf
xfs_sb.c 26.6 KB