Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b657c95c authored by Joel Becker's avatar Joel Becker Committed by Mark Fasheh
Browse files

ocfs2: Wrap inode block reads in a dedicated function. 



The ocfs2 code currently reads inodes off disk with a simple
ocfs2_read_block() call.  Each place that does this has a different set
of sanity checks it performs.  Some check only the signature.  A couple
validate the block number (the block read vs di->i_blkno).  A couple
others check for VALID_FL.  Only one place validates i_fs_generation.  A
couple check nothing.  Even when an error is found, they don't all do
the same thing.

We wrap inode reading into ocfs2_read_inode_block().  This will validate
all the above fields, going readonly if they are invalid (they never
should be).  ocfs2_read_inode_block_full() is provided for the places
that want to pass read_block flags.  Every caller is passing a struct
inode with a valid ip_blkno, so we don't need a separate blkno argument
either.

We will remove the validation checks from the rest of the code in a
later commit, as they are no longer necessary.

Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
Signed-off-by: default avatarMark Fasheh <mfasheh@suse.com>
parent a68979b8

fs/ocfs2/alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -5658,7 +5658,7 @@ static int ocfs2_get_truncate_log_info(struct ocfs2_super *osb, 
		goto bail;

	}



	status = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno, &bh);

	status = ocfs2_read_inode_block(inode, &bh);

	if (status < 0) {

		iput(inode);

		mlog_errno(status);

fs/ocfs2/aops.c

+2 −9
Original line number Diff line number Diff line
@@ -68,20 +68,13 @@ static int ocfs2_symlink_get_block(struct inode *inode, sector_t iblock, 
		goto bail;

	}



	status = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno, &bh);

	status = ocfs2_read_inode_block(inode, &bh);

	if (status < 0) {

		mlog_errno(status);

		goto bail;

	}

	fe = (struct ocfs2_dinode *) bh->b_data;



	if (!OCFS2_IS_VALID_DINODE(fe)) {

		mlog(ML_ERROR, "Invalid dinode #%llu: signature = %.*s\n",

		     (unsigned long long)le64_to_cpu(fe->i_blkno), 7,

		     fe->i_signature);

		goto bail;

	}



	if ((u64)iblock >= ocfs2_clusters_to_blocks(inode->i_sb,

						    le32_to_cpu(fe->i_clusters))) {

		mlog(ML_ERROR, "block offset is outside the allocated size: "
@@ -262,7 +255,7 @@ static int ocfs2_readpage_inline(struct inode *inode, struct page *page) 
	BUG_ON(!PageLocked(page));

	BUG_ON(!(OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL));



	ret = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno, &di_bh);

	ret = ocfs2_read_inode_block(inode, &di_bh);

	if (ret) {

		mlog_errno(ret);

		goto out;

fs/ocfs2/dir.c

+3 −3
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ static struct buffer_head *ocfs2_find_entry_id(const char *name, 
	struct ocfs2_dinode *di;

	struct ocfs2_inline_data *data;



	ret = ocfs2_read_block(dir, OCFS2_I(dir)->ip_blkno, &di_bh);

	ret = ocfs2_read_inode_block(dir, &di_bh);

	if (ret) {

		mlog_errno(ret);

		goto out;
@@ -458,7 +458,7 @@ static inline int ocfs2_delete_entry_id(handle_t *handle, 
	struct ocfs2_dinode *di;

	struct ocfs2_inline_data *data;



	ret = ocfs2_read_block(dir, OCFS2_I(dir)->ip_blkno, &di_bh);

	ret = ocfs2_read_inode_block(dir, &di_bh);

	if (ret) {

		mlog_errno(ret);

		goto out;
@@ -636,7 +636,7 @@ static int ocfs2_dir_foreach_blk_id(struct inode *inode, 
	struct ocfs2_inline_data *data;

	struct ocfs2_dir_entry *de;



	ret = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno, &di_bh);

	ret = ocfs2_read_inode_block(inode, &di_bh);

	if (ret) {

		mlog(ML_ERROR, "Unable to read inode block for dir %llu\n",

		     (unsigned long long)OCFS2_I(inode)->ip_blkno);

fs/ocfs2/dlmglue.c

+4 −8
Original line number Diff line number Diff line
@@ -2024,7 +2024,7 @@ static int ocfs2_inode_lock_update(struct inode *inode, 
	} else {

		/* Boo, we have to go to disk. */

		/* read bh, cast, ocfs2_refresh_inode */

		status = ocfs2_read_block(inode, oi->ip_blkno, bh);

		status = ocfs2_read_inode_block(inode, bh);

		if (status < 0) {

			mlog_errno(status);

			goto bail_refresh;
@@ -2032,18 +2032,14 @@ static int ocfs2_inode_lock_update(struct inode *inode, 
		fe = (struct ocfs2_dinode *) (*bh)->b_data;



		/* This is a good chance to make sure we're not

		 * locking an invalid object.

		 * locking an invalid object.  ocfs2_read_inode_block()

		 * already checked that the inode block is sane.

		 *

		 * We bug on a stale inode here because we checked

		 * above whether it was wiped from disk. The wiping

		 * node provides a guarantee that we receive that

		 * message and can mark the inode before dropping any

		 * locks associated with it. */

		if (!OCFS2_IS_VALID_DINODE(fe)) {

			OCFS2_RO_ON_INVALID_DINODE(inode->i_sb, fe);

			status = -EIO;

			goto bail_refresh;

		}

		mlog_bug_on_msg(inode->i_generation !=

				le32_to_cpu(fe->i_generation),

				"Invalid dinode %llu disk generation: %u "
@@ -2085,7 +2081,7 @@ static int ocfs2_assign_bh(struct inode *inode, 
		return 0;

	}



	status = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno, ret_bh);

	status = ocfs2_read_inode_block(inode, ret_bh);

	if (status < 0)

		mlog_errno(status);

fs/ocfs2/extent_map.c

+1 −1
Original line number Diff line number Diff line
@@ -630,7 +630,7 @@ int ocfs2_get_clusters(struct inode *inode, u32 v_cluster, 
	if (ret == 0)

		goto out;



	ret = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno, &di_bh);

	ret = ocfs2_read_inode_block(inode, &di_bh);

	if (ret) {

		mlog_errno(ret);

		goto out;