diff options
| author | Eric Sandeen <sandeen@sandeen.net> | 2014-08-04 11:35:44 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-08-04 11:35:44 +1000 |
| commit | 5ef828c4152726f56751c78ea844f08d2b2a4fa3 (patch) | |
| tree | 3923a30181baef2d2e4c53bb0e569d7d4046a1c3 /fs/xfs/xfs_mount.c | |
| parent | eedf32bfcace7d8e20cc66757d74fc68f3439ff7 (diff) | |
| download | blackbird-op-linux-5ef828c4152726f56751c78ea844f08d2b2a4fa3.tar.gz blackbird-op-linux-5ef828c4152726f56751c78ea844f08d2b2a4fa3.zip | |
xfs: avoid false quotacheck after unclean shutdown
The commit
83e782e xfs: Remove incore use of XFS_OQUOTA_ENFD and XFS_OQUOTA_CHKD
added a new function xfs_sb_quota_from_disk() which swaps
on-disk XFS_OQUOTA_* flags for in-core XFS_GQUOTA_* and XFS_PQUOTA_*
flags after the superblock is read.
However, if log recovery is required, the superblock is read again,
and the modified in-core flags are re-read from disk, so we have
XFS_OQUOTA_* flags in memory again. This causes the
XFS_QM_NEED_QUOTACHECK() test to be true, because the XFS_OQUOTA_CHKD
is still set, and not XFS_GQUOTA_CHKD or XFS_PQUOTA_CHKD.
Change xfs_sb_from_disk to call xfs_sb_quota_from disk and always
convert the disk flags to in-memory flags.
Add a lower-level function which can be called with "false" to
not convert the flags, so that the sb verifier can verify
exactly what was on disk, per Brian Foster's suggestion.
Reported-by: Cyril B. <cbay@excellency.fr>
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Diffstat (limited to 'fs/xfs/xfs_mount.c')
| -rw-r--r-- | fs/xfs/xfs_mount.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index d5c44a6bdb5b..5612aa8b46ad 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c @@ -324,7 +324,6 @@ reread: * Initialize the mount structure from the superblock. */ xfs_sb_from_disk(sbp, XFS_BUF_TO_SBP(bp)); - xfs_sb_quota_from_disk(sbp); /* * If we haven't validated the superblock, do so now before we try |
