xfs: Use consistent logging message prefixes (f41febd2) · Commits · 戴 / test

fs/xfs/libxfs/xfs_dir2_node.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1845,8 +1845,7 @@ xfs_dir2_node_addname_int(

		if (dp->d_ops->db_to_fdb(args->geo, dbno) != fbno) {
		xfs_alert(mp,
		"%s: dir ino %llu needed freesp block %lld for\n"
		" data block %lld, got %lld ifbno %llu lastfbno %d",
		"%s: dir ino %llu needed freesp block %lld for data block %lld, got %lld ifbno %llu lastfbno %d",
		__func__, (unsigned long long)dp->i_ino,
		(long long)dp->d_ops->db_to_fdb(
		args->geo, dbno),

fs/xfs/libxfs/xfs_sb.c

+9 −5

Original line number	Diff line number	Diff line
		@@ -131,10 +131,11 @@ xfs_mount_validate_sb(
		if (xfs_sb_has_compat_feature(sbp,
		XFS_SB_FEAT_COMPAT_UNKNOWN)) {
		xfs_warn(mp,
		"Superblock has unknown compatible features (0x%x) enabled.\n"
		"Using a more recent kernel is recommended.",
		"Superblock has unknown compatible features (0x%x) enabled.",
		(sbp->sb_features_compat &
		XFS_SB_FEAT_COMPAT_UNKNOWN));
		xfs_warn(mp,
		"Using a more recent kernel is recommended.");
		}

		if (xfs_sb_has_ro_compat_feature(sbp,
		@@ -145,18 +146,21 @@ xfs_mount_validate_sb(
		XFS_SB_FEAT_RO_COMPAT_UNKNOWN));
		if (!(mp->m_flags & XFS_MOUNT_RDONLY)) {
		xfs_warn(mp,
		"Attempted to mount read-only compatible filesystem read-write.\n"
		"Attempted to mount read-only compatible filesystem read-write.");
		xfs_warn(mp,
		"Filesystem can only be safely mounted read only.");

		return -EINVAL;
		}
		}
		if (xfs_sb_has_incompat_feature(sbp,
		XFS_SB_FEAT_INCOMPAT_UNKNOWN)) {
		xfs_warn(mp,
		"Superblock has unknown incompatible features (0x%x) enabled.\n"
		"Filesystem can not be safely mounted by this kernel.",
		"Superblock has unknown incompatible features (0x%x) enabled.",
		(sbp->sb_features_incompat &
		XFS_SB_FEAT_INCOMPAT_UNKNOWN));
		xfs_warn(mp,
		"Filesystem can not be safely mounted by this kernel.");
		return -EINVAL;
		}
		}

fs/xfs/xfs_buf.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -1533,9 +1533,10 @@ xfs_wait_buftarg(
		list_del_init(&bp->b_lru);
		if (bp->b_flags & XBF_WRITE_FAIL) {
		xfs_alert(btp->bt_mount,
		"Corruption Alert: Buffer at block 0x%llx had permanent write failures!\n"
		"Please run xfs_repair to determine the extent of the problem.",
		"Corruption Alert: Buffer at block 0x%llx had permanent write failures!",
		(long long)bp->b_bn);
		xfs_alert(btp->bt_mount,
		"Please run xfs_repair to determine the extent of the problem.");
		}
		xfs_buf_rele(bp);
		}

fs/xfs/xfs_log.c

+25 −25

Original line number	Diff line number	Diff line
		@@ -668,9 +668,9 @@ xfs_log_mount(
		ASSERT(0);
		goto out_free_log;
		}
		xfs_crit(mp, "Log size out of supported range.");
		xfs_crit(mp,
		"Log size out of supported range. Continuing onwards, but if log hangs are\n"
		"experienced then please report this message in the bug report.");
		"Continuing onwards, but if log hangs are experienced then please report this message in the bug report.");
		}

		/*
		@@ -1142,11 +1142,13 @@ xlog_space_left(
		* In this case we just want to return the size of the
		* log as the amount of space left.
		*/
		xfs_alert(log->l_mp, "xlog_space_left: head behind tail");
		xfs_alert(log->l_mp,
		" tail_cycle = %d, tail_bytes = %d",
		tail_cycle, tail_bytes);
		xfs_alert(log->l_mp,
		"xlog_space_left: head behind tail\n"
		" tail_cycle = %d, tail_bytes = %d\n"
		" GH cycle = %d, GH bytes = %d",
		tail_cycle, tail_bytes, head_cycle, head_bytes);
		head_cycle, head_bytes);
		ASSERT(0);
		free_bytes = log->l_logsize;
		}
		@@ -2028,25 +2030,23 @@ xlog_print_tic_res(
		"SWAPEXT"
		};

		xfs_warn(mp,
		"xlog_write: reservation summary:\n"
		" trans type = %s (%u)\n"
		" unit res = %d bytes\n"
		" current res = %d bytes\n"
		" total reg = %u bytes (o/flow = %u bytes)\n"
		" ophdrs = %u (ophdr space = %u bytes)\n"
		" ophdr + reg = %u bytes\n"
		" num regions = %u",
		xfs_warn(mp, "xlog_write: reservation summary:");
		xfs_warn(mp, " trans type = %s (%u)",
		((ticket->t_trans_type <= 0 \|\|
		ticket->t_trans_type > XFS_TRANS_TYPE_MAX) ?
		"bad-trans-type" : trans_type_str[ticket->t_trans_type-1]),
		ticket->t_trans_type,
		ticket->t_unit_res,
		ticket->t_curr_res,
		ticket->t_res_arr_sum, ticket->t_res_o_flow,
		ticket->t_res_num_ophdrs, ophdr_spc,
		ticket->t_res_arr_sum +
		ticket->t_res_o_flow + ophdr_spc,
		ticket->t_trans_type);
		xfs_warn(mp, " unit res = %d bytes",
		ticket->t_unit_res);
		xfs_warn(mp, " current res = %d bytes",
		ticket->t_curr_res);
		xfs_warn(mp, " total reg = %u bytes (o/flow = %u bytes)",
		ticket->t_res_arr_sum, ticket->t_res_o_flow);
		xfs_warn(mp, " ophdrs = %u (ophdr space = %u bytes)",
		ticket->t_res_num_ophdrs, ophdr_spc);
		xfs_warn(mp, " ophdr + reg = %u bytes",
		ticket->t_res_arr_sum + ticket->t_res_o_flow + ophdr_spc);
		xfs_warn(mp, " num regions = %u",
		ticket->t_res_num);

		for (i = 0; i < ticket->t_res_num; i++) {

fs/xfs/xfs_log_recover.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -4549,11 +4549,13 @@ xlog_recover(
		xfs_sb_has_incompat_log_feature(&log->l_mp->m_sb,
		XFS_SB_FEAT_INCOMPAT_LOG_UNKNOWN)) {
		xfs_warn(log->l_mp,
		"Superblock has unknown incompatible log features (0x%x) enabled.\n"
		"The log can not be fully and/or safely recovered by this kernel.\n"
		"Please recover the log on a kernel that supports the unknown features.",
		"Superblock has unknown incompatible log features (0x%x) enabled.",
		(log->l_mp->m_sb.sb_features_log_incompat &
		XFS_SB_FEAT_INCOMPAT_LOG_UNKNOWN));
		xfs_warn(log->l_mp,
		"The log can not be fully and/or safely recovered by this kernel.");
		xfs_warn(log->l_mp,
		"Please recover the log on a kernel that supports the unknown features.");
		return -EINVAL;
		}

Admin message