ocfs2: block read meta ecc. (d6b32bbb) · Commits · e / devices / android_kernel_oneplus_sm8150

fs/ocfs2/alloc.c

+17 −0

Original line number	Original line	Diff line number	Diff line
	@@ -37,6 +37,7 @@

	#include "alloc.h"		#include "alloc.h"
	#include "aops.h"		#include "aops.h"
			#include "blockcheck.h"
	#include "dlmglue.h"		#include "dlmglue.h"
	#include "extent_map.h"		#include "extent_map.h"
	#include "inode.h"		#include "inode.h"
	@@ -682,12 +683,28 @@ struct ocfs2_merge_ctxt {
	static int ocfs2_validate_extent_block(struct super_block *sb,		static int ocfs2_validate_extent_block(struct super_block *sb,
	struct buffer_head *bh)		struct buffer_head *bh)
	{		{
			int rc;
	struct ocfs2_extent_block *eb =		struct ocfs2_extent_block *eb =
	(struct ocfs2_extent_block *)bh->b_data;		(struct ocfs2_extent_block *)bh->b_data;

	mlog(0, "Validating extent block %llu\n",		mlog(0, "Validating extent block %llu\n",
	(unsigned long long)bh->b_blocknr);		(unsigned long long)bh->b_blocknr);

			BUG_ON(!buffer_uptodate(bh));

			/*
			* If the ecc fails, we return the error but otherwise
			* leave the filesystem running. We know any error is
			* local to this block.
			*/
			rc = ocfs2_validate_meta_ecc(sb, bh->b_data, &eb->h_check);
			if (rc)
			return rc;

			/*
			* Errors after here are fatal.
			*/

	if (!OCFS2_IS_VALID_EXTENT_BLOCK(eb)) {		if (!OCFS2_IS_VALID_EXTENT_BLOCK(eb)) {
	ocfs2_error(sb,		ocfs2_error(sb,
	"Extent block #%llu has bad signature %.*s",		"Extent block #%llu has bad signature %.*s",

fs/ocfs2/blockcheck.c

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -24,6 +24,8 @@
	#include <linux/bitops.h>		#include <linux/bitops.h>
	#include <asm/byteorder.h>		#include <asm/byteorder.h>

			#include <cluster/masklog.h>

	#include "ocfs2.h"		#include "ocfs2.h"

	#include "blockcheck.h"		#include "blockcheck.h"
	@@ -292,6 +294,10 @@ int ocfs2_block_check_validate(void *data, size_t blocksize,
	if (crc == check.bc_crc32e)		if (crc == check.bc_crc32e)
	goto out;		goto out;

			mlog(ML_ERROR,
			"CRC32 failed: stored: %u, computed %u. Applying ECC.\n",
			(unsigned int)check.bc_crc32e, (unsigned int)crc);

	/* Ok, try ECC fixups */		/* Ok, try ECC fixups */
	ecc = ocfs2_hamming_encode_block(data, blocksize);		ecc = ocfs2_hamming_encode_block(data, blocksize);
	ocfs2_hamming_fix_block(data, blocksize, ecc ^ check.bc_ecc);		ocfs2_hamming_fix_block(data, blocksize, ecc ^ check.bc_ecc);
	@@ -301,6 +307,9 @@ int ocfs2_block_check_validate(void *data, size_t blocksize,
	if (crc == check.bc_crc32e)		if (crc == check.bc_crc32e)
	goto out;		goto out;

			mlog(ML_ERROR, "Fixed CRC32 failed: stored: %u, computed %u\n",
			(unsigned int)check.bc_crc32e, (unsigned int)crc);

	rc = -EIO;		rc = -EIO;

	out:		out:

fs/ocfs2/inode.c

+17 −1

Original line number	Original line	Diff line number	Diff line
	@@ -38,6 +38,7 @@
	#include "ocfs2.h"		#include "ocfs2.h"

	#include "alloc.h"		#include "alloc.h"
			#include "blockcheck.h"
	#include "dlmglue.h"		#include "dlmglue.h"
	#include "extent_map.h"		#include "extent_map.h"
	#include "file.h"		#include "file.h"
	@@ -1262,7 +1263,7 @@ void ocfs2_refresh_inode(struct inode *inode,
	int ocfs2_validate_inode_block(struct super_block *sb,		int ocfs2_validate_inode_block(struct super_block *sb,
	struct buffer_head *bh)		struct buffer_head *bh)
	{		{
	int rc = -EINVAL;		int rc;
	struct ocfs2_dinode di = (struct ocfs2_dinode )bh->b_data;		struct ocfs2_dinode di = (struct ocfs2_dinode )bh->b_data;

	mlog(0, "Validating dinode %llu\n",		mlog(0, "Validating dinode %llu\n",
	@@ -1270,6 +1271,21 @@ int ocfs2_validate_inode_block(struct super_block *sb,

	BUG_ON(!buffer_uptodate(bh));		BUG_ON(!buffer_uptodate(bh));

			/*
			* If the ecc fails, we return the error but otherwise
			* leave the filesystem running. We know any error is
			* local to this block.
			*/
			rc = ocfs2_validate_meta_ecc(sb, bh->b_data, &di->i_check);
			if (rc)
			goto bail;

			/*
			* Errors after here are fatal.
			*/

			rc = -EINVAL;

	if (!OCFS2_IS_VALID_DINODE(di)) {		if (!OCFS2_IS_VALID_DINODE(di)) {
	ocfs2_error(sb, "Invalid dinode #%llu: signature = %.*s\n",		ocfs2_error(sb, "Invalid dinode #%llu: signature = %.*s\n",
	(unsigned long long)bh->b_blocknr, 7,		(unsigned long long)bh->b_blocknr, 7,

fs/ocfs2/quota_global.c

+11 −2

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@
	#include "ocfs2_fs.h"		#include "ocfs2_fs.h"
	#include "ocfs2.h"		#include "ocfs2.h"
	#include "alloc.h"		#include "alloc.h"
			#include "blockcheck.h"
	#include "inode.h"		#include "inode.h"
	#include "journal.h"		#include "journal.h"
	#include "file.h"		#include "file.h"
	@@ -90,12 +91,20 @@ struct qtree_fmt_operations ocfs2_global_ops = {
	static int ocfs2_validate_quota_block(struct super_block *sb,		static int ocfs2_validate_quota_block(struct super_block *sb,
	struct buffer_head *bh)		struct buffer_head *bh)
	{		{
	struct ocfs2_disk_dqtrailer *dqt = ocfs2_dq_trailer(sb, bh->b_data);		struct ocfs2_disk_dqtrailer *dqt =
			ocfs2_block_dqtrailer(sb->s_blocksize, bh->b_data);

	mlog(0, "Validating quota block %llu\n",		mlog(0, "Validating quota block %llu\n",
	(unsigned long long)bh->b_blocknr);		(unsigned long long)bh->b_blocknr);

	return 0;		BUG_ON(!buffer_uptodate(bh));

			/*
			* If the ecc fails, we return the error but otherwise
			* leave the filesystem running. We know any error is
			* local to this block.
			*/
			return ocfs2_validate_meta_ecc(sb, bh->b_data, &dqt->dq_check);
	}		}

	int ocfs2_read_quota_block(struct inode *inode, u64 v_block,		int ocfs2_read_quota_block(struct inode *inode, u64 v_block,

fs/ocfs2/suballoc.c

+30 −1

Original line number	Original line	Diff line number	Diff line
	@@ -35,6 +35,7 @@
	#include "ocfs2.h"		#include "ocfs2.h"

	#include "alloc.h"		#include "alloc.h"
			#include "blockcheck.h"
	#include "dlmglue.h"		#include "dlmglue.h"
	#include "inode.h"		#include "inode.h"
	#include "journal.h"		#include "journal.h"
	@@ -250,7 +251,17 @@ int ocfs2_check_group_descriptor(struct super_block *sb,
	struct buffer_head *bh)		struct buffer_head *bh)
	{		{
	int rc;		int rc;
			struct ocfs2_group_desc gd = (struct ocfs2_group_desc )bh->b_data;

			BUG_ON(!buffer_uptodate(bh));

			/*
			* If the ecc fails, we return the error but otherwise
			* leave the filesystem running. We know any error is
			* local to this block.
			*/
			rc = ocfs2_validate_meta_ecc(sb, bh->b_data, &gd->bg_check);
			if (!rc)
	rc = ocfs2_validate_gd_self(sb, bh, 1);		rc = ocfs2_validate_gd_self(sb, bh, 1);
	if (!rc)		if (!rc)
	rc = ocfs2_validate_gd_parent(sb, di, bh, 1);		rc = ocfs2_validate_gd_parent(sb, di, bh, 1);
	@@ -261,9 +272,27 @@ int ocfs2_check_group_descriptor(struct super_block *sb,
	static int ocfs2_validate_group_descriptor(struct super_block *sb,		static int ocfs2_validate_group_descriptor(struct super_block *sb,
	struct buffer_head *bh)		struct buffer_head *bh)
	{		{
			int rc;
			struct ocfs2_group_desc gd = (struct ocfs2_group_desc )bh->b_data;

	mlog(0, "Validating group descriptor %llu\n",		mlog(0, "Validating group descriptor %llu\n",
	(unsigned long long)bh->b_blocknr);		(unsigned long long)bh->b_blocknr);

			BUG_ON(!buffer_uptodate(bh));

			/*
			* If the ecc fails, we return the error but otherwise
			* leave the filesystem running. We know any error is
			* local to this block.
			*/
			rc = ocfs2_validate_meta_ecc(sb, bh->b_data, &gd->bg_check);
			if (rc)
			return rc;

			/*
			* Errors after here are fatal.
			*/

	return ocfs2_validate_gd_self(sb, bh, 0);		return ocfs2_validate_gd_self(sb, bh, 0);
	}		}