Commit 01047631 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xfs-5.2-fixes-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux 

Pull xfs fixes from Darrick Wong:
 "Here are a couple more bug fixes for 5.2. Changes since last update:

   - Fix some forgotten strings in a log debugging function

   - Fix incorrect unit conversion in online fsck code"

* tag 'xfs-5.2-fixes-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: inode btree scrubber should calculate im_boffset correctly
  xfs: fix broken log reservation debugging
parents dc8ca9cc 025197eb

fs/xfs/scrub/ialloc.c

+2 −1
Original line number Diff line number Diff line
@@ -252,7 +252,8 @@ xchk_iallocbt_check_cluster( 
	ir_holemask = (irec->ir_holemask & cluster_mask);

	imap.im_blkno = XFS_AGB_TO_DADDR(mp, agno, agbno);

	imap.im_len = XFS_FSB_TO_BB(mp, mp->m_blocks_per_cluster);

	imap.im_boffset = XFS_INO_TO_OFFSET(mp, irec->ir_startino);

	imap.im_boffset = XFS_INO_TO_OFFSET(mp, irec->ir_startino) <<

			mp->m_sb.sb_inodelog;



	if (imap.im_boffset != 0 && cluster_base != 0) {

		ASSERT(imap.im_boffset == 0 || cluster_base == 0);

fs/xfs/xfs_log.c

+9 −2
Original line number Diff line number Diff line
@@ -2069,7 +2069,7 @@ xlog_print_tic_res( 


	/* match with XLOG_REG_TYPE_* in xfs_log.h */

#define REG_TYPE_STR(type, str)	[XLOG_REG_TYPE_##type] = str

	static char *res_type_str[XLOG_REG_TYPE_MAX + 1] = {

	static char *res_type_str[] = {

	    REG_TYPE_STR(BFORMAT, "bformat"),

	    REG_TYPE_STR(BCHUNK, "bchunk"),

	    REG_TYPE_STR(EFI_FORMAT, "efi_format"),
@@ -2089,8 +2089,15 @@ xlog_print_tic_res( 
	    REG_TYPE_STR(UNMOUNT, "unmount"),

	    REG_TYPE_STR(COMMIT, "commit"),

	    REG_TYPE_STR(TRANSHDR, "trans header"),

	    REG_TYPE_STR(ICREATE, "inode create")

	    REG_TYPE_STR(ICREATE, "inode create"),

	    REG_TYPE_STR(RUI_FORMAT, "rui_format"),

	    REG_TYPE_STR(RUD_FORMAT, "rud_format"),

	    REG_TYPE_STR(CUI_FORMAT, "cui_format"),

	    REG_TYPE_STR(CUD_FORMAT, "cud_format"),

	    REG_TYPE_STR(BUI_FORMAT, "bui_format"),

	    REG_TYPE_STR(BUD_FORMAT, "bud_format"),

	};

	BUILD_BUG_ON(ARRAY_SIZE(res_type_str) != XLOG_REG_TYPE_MAX + 1);

#undef REG_TYPE_STR



	xfs_warn(mp, "ticket reservation summary:");

CRA Git | Maintained and supported by SUSTech CRA and CCSE