xfs: force summary counter recalc at next mount (f467cad9) · Commits · 戴 / test

fs/xfs/libxfs/xfs_errortag.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,8 @@
		#define XFS_ERRTAG_LOG_ITEM_PIN 30
		#define XFS_ERRTAG_BUF_LRU_REF 31
		#define XFS_ERRTAG_FORCE_SCRUB_REPAIR 32
		#define XFS_ERRTAG_MAX 33
		#define XFS_ERRTAG_FORCE_SUMMARY_RECALC 33
		#define XFS_ERRTAG_MAX 34

		/*
		* Random factors for above tags, 1 means always, 2 means 1/2 time, etc.
		@@ -91,5 +92,6 @@
		#define XFS_RANDOM_LOG_ITEM_PIN 1
		#define XFS_RANDOM_BUF_LRU_REF 2
		#define XFS_RANDOM_FORCE_SCRUB_REPAIR 1
		#define XFS_RANDOM_FORCE_SUMMARY_RECALC 1

		#endif /* __XFS_ERRORTAG_H_ */

+3 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@ static unsigned int xfs_errortag_random_default[] = {
		XFS_RANDOM_LOG_ITEM_PIN,
		XFS_RANDOM_BUF_LRU_REF,
		XFS_RANDOM_FORCE_SCRUB_REPAIR,
		XFS_RANDOM_FORCE_SUMMARY_RECALC,
		};

		struct xfs_errortag_attr {
		@@ -157,6 +158,7 @@ XFS_ERRORTAG_ATTR_RW(log_bad_crc, XFS_ERRTAG_LOG_BAD_CRC);
		XFS_ERRORTAG_ATTR_RW(log_item_pin, XFS_ERRTAG_LOG_ITEM_PIN);
		XFS_ERRORTAG_ATTR_RW(buf_lru_ref, XFS_ERRTAG_BUF_LRU_REF);
		XFS_ERRORTAG_ATTR_RW(force_repair, XFS_ERRTAG_FORCE_SCRUB_REPAIR);
		XFS_ERRORTAG_ATTR_RW(bad_summary, XFS_ERRTAG_FORCE_SUMMARY_RECALC);

		static struct attribute *xfs_errortag_attrs[] = {
		XFS_ERRORTAG_ATTR_LIST(noerror),
		@@ -192,6 +194,7 @@ static struct attribute *xfs_errortag_attrs[] = {
		XFS_ERRORTAG_ATTR_LIST(log_item_pin),
		XFS_ERRORTAG_ATTR_LIST(buf_lru_ref),
		XFS_ERRORTAG_ATTR_LIST(force_repair),
		XFS_ERRORTAG_ATTR_LIST(bad_summary),
		NULL,
		};

+15 −1

Original line number	Diff line number	Diff line
		@@ -848,16 +848,30 @@ xfs_log_write_unmount_record(
		struct xlog_in_core *iclog;
		struct xlog_ticket *tic = NULL;
		xfs_lsn_t lsn;
		uint flags = XLOG_UNMOUNT_TRANS;
		int error;

		error = xfs_log_reserve(mp, 600, 1, &tic, XFS_LOG, 0);
		if (error)
		goto out_err;

		/*
		* If we think the summary counters are bad, clear the unmount header
		* flag in the unmount record so that the summary counters will be
		* recalculated during log recovery at next mount. Refer to
		* xlog_check_unmount_rec for more details.
		*/
		if (XFS_TEST_ERROR((mp->m_flags & XFS_MOUNT_BAD_SUMMARY), mp,
		XFS_ERRTAG_FORCE_SUMMARY_RECALC)) {
		xfs_alert(mp, "%s: will fix summary counters at next mount",
		__func__);
		flags &= ~XLOG_UNMOUNT_TRANS;
		}

		/* remove inited flag, and account for space used */
		tic->t_flags = 0;
		tic->t_curr_res -= sizeof(magic);
		error = xlog_write(log, &vec, tic, &lsn, NULL, XLOG_UNMOUNT_TRANS);
		error = xlog_write(log, &vec, tic, &lsn, NULL, flags);
		/*
		* At this point, we're umounting anyway, so there's no point in
		* transitioning log state to IOERROR. Just continue...

+13 −0

Original line number	Diff line number	Diff line
		@@ -1423,3 +1423,16 @@ xfs_dev_is_read_only(
		}
		return 0;
		}

		/* Force the summary counters to be recalculated at next mount. */
		void
		xfs_force_summary_recalc(
		struct xfs_mount *mp)
		{
		if (!xfs_sb_version_haslazysbcount(&mp->m_sb))
		return;

		spin_lock(&mp->m_sb_lock);
		mp->m_flags \|= XFS_MOUNT_BAD_SUMMARY;
		spin_unlock(&mp->m_sb_lock);
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -435,5 +435,6 @@ int xfs_zero_extent(struct xfs_inode *ip, xfs_fsblock_t start_fsb,

		struct xfs_error_cfg * xfs_error_get_cfg(struct xfs_mount *mp,
		int error_class, int error);
		void xfs_force_summary_recalc(struct xfs_mount *mp);

		#endif /* __XFS_MOUNT_H__ */