Unverified Commit cfc1a823 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11338 xfs: fix log recovery when unknown rocompat bits are set 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zizhi Wo <wozizhi@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/3Y62ORFHBUJZZLNGILRIIKZNYMELCZCI/ 
 
https://gitee.com/openeuler/kernel/issues/IAO91J 
 
Link:https://gitee.com/openeuler/kernel/pulls/11338

 

Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents 84e0aed3 5febbb8f

fs/xfs/libxfs/xfs_sb.c

+2 −1
Original line number Diff line number Diff line
@@ -280,7 +280,8 @@ xfs_validate_sb_write( 
		return -EFSCORRUPTED;

	}



	if (xfs_sb_has_ro_compat_feature(sbp, XFS_SB_FEAT_RO_COMPAT_UNKNOWN)) {

	if (!xfs_is_readonly(mp) &&

	    xfs_sb_has_ro_compat_feature(sbp, XFS_SB_FEAT_RO_COMPAT_UNKNOWN)) {

		xfs_alert(mp,

"Corruption detected in superblock read-only compatible features (0x%x)!",

			(sbp->sb_features_ro_compat &

fs/xfs/xfs_log.c

+0 −17
Original line number Diff line number Diff line
@@ -687,15 +687,7 @@ xfs_log_mount( 
	 * just worked.

	 */

	if (!xfs_has_norecovery(mp)) {

		/*

		 * log recovery ignores readonly state and so we need to clear

		 * mount-based read only state so it can write to disk.

		 */

		bool	readonly = test_and_clear_bit(XFS_OPSTATE_READONLY,

						&mp->m_opstate);

		error = xlog_recover(log);

		if (readonly)

			set_bit(XFS_OPSTATE_READONLY, &mp->m_opstate);

		if (error) {

			xfs_warn(mp, "log mount/recovery failed: error %d",

				error);
@@ -744,7 +736,6 @@ xfs_log_mount_finish( 
	struct xfs_mount	*mp)

{

	struct xlog		*log = mp->m_log;

	bool			readonly;

	int			error = 0;



	if (xfs_has_norecovery(mp)) {
@@ -752,12 +743,6 @@ xfs_log_mount_finish( 
		return 0;

	}



	/*

	 * log recovery ignores readonly state and so we need to clear

	 * mount-based read only state so it can write to disk.

	 */

	readonly = test_and_clear_bit(XFS_OPSTATE_READONLY, &mp->m_opstate);



	/*

	 * During the second phase of log recovery, we need iget and

	 * iput to behave like they do for an active filesystem.
@@ -809,8 +794,6 @@ xfs_log_mount_finish( 
		xfs_wait_buftarg(mp->m_ddev_targp);



	clear_bit(XLOG_RECOVERY_NEEDED, &log->l_opstate);

	if (readonly)

		set_bit(XFS_OPSTATE_READONLY, &mp->m_opstate);



	/* Make sure the log is dead if we're returning failure. */

	ASSERT(!error || xlog_is_shutdown(log));