iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfs: replace the BAD_SUMMARY mount flag with the equivalent health code

Browse Source 
Replace the BAD_SUMMARY mount flag with calls to the equivalent health
tracking code.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
This commit is contained in:
Darrick J. Wong 2019-04-12 07:41:15 -07:00
parent 6772c1f112
commit 39353ff6e9
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/xfs/libxfs/xfs_sb.c
View File

@ -30,6 +30,7 @@
#include "xfs_refcount_btree.h" #include "xfs_refcount_btree.h"
#include "xfs_da_format.h" #include "xfs_da_format.h"
#include "xfs_da_btree.h" #include "xfs_da_btree.h"
#include "xfs_health.h"
/* /*
* Physical superblock buffer manipulations. Shared with libxfs in userspace. * Physical superblock buffer manipulations. Shared with libxfs in userspace.
@ -905,7 +906,7 @@ xfs_initialize_perag_data(
/* /*
* If the new summary counts are obviously incorrect, fail the * If the new summary counts are obviously incorrect, fail the
* mount operation because that implies the AGFs are also corrupt. * mount operation because that implies the AGFs are also corrupt.
* Clear BAD_SUMMARY so that we don't unmount with a dirty log, which * Clear FS_COUNTERS so that we don't unmount with a dirty log, which
* will prevent xfs_repair from fixing anything. * will prevent xfs_repair from fixing anything.
*/ */
if (fdblocks > sbp->sb_dblocks || ifree > ialloc) { if (fdblocks > sbp->sb_dblocks || ifree > ialloc) {
@ -923,7 +924,7 @@ xfs_initialize_perag_data(
xfs_reinit_percpu_counters(mp); xfs_reinit_percpu_counters(mp);
out: out:
mp->m_flags &= ~XFS_MOUNT_BAD_SUMMARY; xfs_fs_mark_healthy(mp, XFS_SICK_FS_COUNTERS);
return error; return error;
} }

3
fs/xfs/xfs_log.c
View File

@ -23,6 +23,7 @@
#include "xfs_cksum.h" #include "xfs_cksum.h"
#include "xfs_sysfs.h" #include "xfs_sysfs.h"
#include "xfs_sb.h" #include "xfs_sb.h"
#include "xfs_health.h"
kmem_zone_t *xfs_log_ticket_zone; kmem_zone_t *xfs_log_ticket_zone;
@ -861,7 +862,7 @@ xfs_log_write_unmount_record(
* recalculated during log recovery at next mount. Refer to * recalculated during log recovery at next mount. Refer to
* xlog_check_unmount_rec for more details. * xlog_check_unmount_rec for more details.
*/ */
if (XFS_TEST_ERROR((mp->m_flags & XFS_MOUNT_BAD_SUMMARY), mp, if (XFS_TEST_ERROR(xfs_fs_has_sickness(mp, XFS_SICK_FS_COUNTERS), mp,
XFS_ERRTAG_FORCE_SUMMARY_RECALC)) { XFS_ERRTAG_FORCE_SUMMARY_RECALC)) {
xfs_alert(mp, "%s: will fix summary counters at next mount", xfs_alert(mp, "%s: will fix summary counters at next mount",
__func__); __func__);

9
fs/xfs/xfs_mount.c
View File

@ -34,6 +34,7 @@
#include "xfs_refcount_btree.h" #include "xfs_refcount_btree.h"
#include "xfs_reflink.h" #include "xfs_reflink.h"
#include "xfs_extent_busy.h" #include "xfs_extent_busy.h"
#include "xfs_health.h"
static DEFINE_MUTEX(xfs_uuid_table_mutex); static DEFINE_MUTEX(xfs_uuid_table_mutex);
@ -645,7 +646,7 @@ xfs_check_summary_counts(
(mp->m_sb.sb_fdblocks > mp->m_sb.sb_dblocks || (mp->m_sb.sb_fdblocks > mp->m_sb.sb_dblocks ||
!xfs_verify_icount(mp, mp->m_sb.sb_icount) || !xfs_verify_icount(mp, mp->m_sb.sb_icount) ||
mp->m_sb.sb_ifree > mp->m_sb.sb_icount)) mp->m_sb.sb_ifree > mp->m_sb.sb_icount))
mp->m_flags |= XFS_MOUNT_BAD_SUMMARY; xfs_fs_mark_sick(mp, XFS_SICK_FS_COUNTERS);
/* /*
* We can safely re-initialise incore superblock counters from the * We can safely re-initialise incore superblock counters from the
@ -660,7 +661,7 @@ xfs_check_summary_counts(
*/ */
if ((!xfs_sb_version_haslazysbcount(&mp->m_sb) || if ((!xfs_sb_version_haslazysbcount(&mp->m_sb) ||
XFS_LAST_UNMOUNT_WAS_CLEAN(mp)) && XFS_LAST_UNMOUNT_WAS_CLEAN(mp)) &&
!(mp->m_flags & XFS_MOUNT_BAD_SUMMARY)) !xfs_fs_has_sickness(mp, XFS_SICK_FS_COUNTERS))
return 0; return 0;
return xfs_initialize_perag_data(mp, mp->m_sb.sb_agcount); return xfs_initialize_perag_data(mp, mp->m_sb.sb_agcount);
@ -1446,7 +1447,5 @@ xfs_force_summary_recalc(
if (!xfs_sb_version_haslazysbcount(&mp->m_sb)) if (!xfs_sb_version_haslazysbcount(&mp->m_sb))
return; return;
spin_lock(&mp->m_sb_lock); xfs_fs_mark_sick(mp, XFS_SICK_FS_COUNTERS);
mp->m_flags |= XFS_MOUNT_BAD_SUMMARY;
spin_unlock(&mp->m_sb_lock);
} }

1
fs/xfs/xfs_mount.h
View File

@ -228,7 +228,6 @@ typedef struct xfs_mount {
must be synchronous except must be synchronous except
for space allocations */ for space allocations */
#define XFS_MOUNT_UNMOUNTING (1ULL << 1) /* filesystem is unmounting */ #define XFS_MOUNT_UNMOUNTING (1ULL << 1) /* filesystem is unmounting */
#define XFS_MOUNT_BAD_SUMMARY (1ULL << 2) /* summary counters are bad */
#define XFS_MOUNT_WAS_CLEAN (1ULL << 3) #define XFS_MOUNT_WAS_CLEAN (1ULL << 3)
#define XFS_MOUNT_FS_SHUTDOWN (1ULL << 4) /* atomic stop of all filesystem #define XFS_MOUNT_FS_SHUTDOWN (1ULL << 4) /* atomic stop of all filesystem
operations, typically for operations, typically for