Merge tag 'xfs-fixes-for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs (dfc85286) · Commits · 戴 / test

Pull xfs fix from Dve Chinner: "This contains a fix for an endian conversion issue in new CRC validation in log recovery that was discovered on a ppc64 platform" * tag 'xfs-fixes-for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs: xfs: fix endianness error when checking log block crc on big endian platforms

fs/xfs/xfs_log_recover.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -4491,7 +4491,7 @@ xlog_recover_process(
		* know precisely what failed.
		*/
		if (pass == XLOG_RECOVER_CRCPASS) {
		if (rhead->h_crc && crc != le32_to_cpu(rhead->h_crc))
		if (rhead->h_crc && crc != rhead->h_crc)
		return -EFSBADCRC;
		return 0;
		}
		@@ -4502,7 +4502,7 @@ xlog_recover_process(
		* zero CRC check prevents warnings from being emitted when upgrading
		* the kernel from one that does not add CRCs by default.
		*/
		if (crc != le32_to_cpu(rhead->h_crc)) {
		if (crc != rhead->h_crc) {
		if (rhead->h_crc \|\| xfs_sb_version_hascrc(&log->l_mp->m_sb)) {
		xfs_alert(log->l_mp,
		"log record CRC mismatch: found 0x%x, expected 0x%x.",

Admin message