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

Commit 17a5b9ab authored by Goldwyn Rodrigues's avatar Goldwyn Rodrigues Committed by Linus Torvalds
Browse files

ocfs2: acknowledge return value of ocfs2_error() 



Caveat: This may return -EROFS for a read case, which seems wrong.  This
is happening even without this patch series though.  Should we convert
EROFS to EIO?

Signed-off-by: default avatarGoldwyn Rodrigues <rgoldwyn@suse.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7d0fb914

fs/ocfs2/alloc.c

+8 −8
Original line number Diff line number Diff line
@@ -908,32 +908,32 @@ static int ocfs2_validate_extent_block(struct super_block *sb, 
	 */



	if (!OCFS2_IS_VALID_EXTENT_BLOCK(eb)) {

		ocfs2_error(sb,

		rc = ocfs2_error(sb,

			    "Extent block #%llu has bad signature %.*s",

			    (unsigned long long)bh->b_blocknr, 7,

			    eb->h_signature);

		return -EINVAL;

		goto bail;

	}



	if (le64_to_cpu(eb->h_blkno) != bh->b_blocknr) {

		ocfs2_error(sb,

		rc = ocfs2_error(sb,

			    "Extent block #%llu has an invalid h_blkno "

			    "of %llu",

			    (unsigned long long)bh->b_blocknr,

			    (unsigned long long)le64_to_cpu(eb->h_blkno));

		return -EINVAL;

		goto bail;

	}



	if (le32_to_cpu(eb->h_fs_generation) != OCFS2_SB(sb)->fs_generation) {

		ocfs2_error(sb,

		rc = ocfs2_error(sb,

			    "Extent block #%llu has an invalid "

			    "h_fs_generation of #%u",

			    (unsigned long long)bh->b_blocknr,

			    le32_to_cpu(eb->h_fs_generation));

		return -EINVAL;

		goto bail;

	}



	return 0;

bail:

	return rc;

}



int ocfs2_read_extent_block(struct ocfs2_caching_info *ci, u64 eb_blkno,

fs/ocfs2/dir.c

+9 −16
Original line number Diff line number Diff line
@@ -480,8 +480,7 @@ static int ocfs2_check_dir_trailer(struct inode *dir, struct buffer_head *bh) 


	trailer = ocfs2_trailer_from_bh(bh, dir->i_sb);

	if (!OCFS2_IS_VALID_DIR_TRAILER(trailer)) {

		rc = -EINVAL;

		ocfs2_error(dir->i_sb,

		rc = ocfs2_error(dir->i_sb,

			    "Invalid dirblock #%llu: "

			    "signature = %.*s\n",

			    (unsigned long long)bh->b_blocknr, 7,
@@ -489,8 +488,7 @@ static int ocfs2_check_dir_trailer(struct inode *dir, struct buffer_head *bh) 
		goto out;

	}

	if (le64_to_cpu(trailer->db_blkno) != bh->b_blocknr) {

		rc = -EINVAL;

		ocfs2_error(dir->i_sb,

		rc = ocfs2_error(dir->i_sb,

			    "Directory block #%llu has an invalid "

			    "db_blkno of %llu",

			    (unsigned long long)bh->b_blocknr,
@@ -499,8 +497,7 @@ static int ocfs2_check_dir_trailer(struct inode *dir, struct buffer_head *bh) 
	}

	if (le64_to_cpu(trailer->db_parent_dinode) !=

	    OCFS2_I(dir)->ip_blkno) {

		rc = -EINVAL;

		ocfs2_error(dir->i_sb,

		rc = ocfs2_error(dir->i_sb,

			    "Directory block #%llu on dinode "

			    "#%llu has an invalid parent_dinode "

			    "of %llu",
@@ -604,14 +601,13 @@ static int ocfs2_validate_dx_root(struct super_block *sb, 
	}



	if (!OCFS2_IS_VALID_DX_ROOT(dx_root)) {

		ocfs2_error(sb,

		ret = ocfs2_error(sb,

			    "Dir Index Root # %llu has bad signature %.*s",

			    (unsigned long long)le64_to_cpu(dx_root->dr_blkno),

			    7, dx_root->dr_signature);

		return -EINVAL;

	}



	return 0;

	return ret;

}



static int ocfs2_read_dx_root(struct inode *dir, struct ocfs2_dinode *di,
@@ -648,12 +644,11 @@ static int ocfs2_validate_dx_leaf(struct super_block *sb, 
	}



	if (!OCFS2_IS_VALID_DX_LEAF(dx_leaf)) {

		ocfs2_error(sb, "Dir Index Leaf has bad signature %.*s",

		ret = ocfs2_error(sb, "Dir Index Leaf has bad signature %.*s",

			    7, dx_leaf->dl_signature);

		return -EROFS;

	}



	return 0;

	return ret;

}



static int ocfs2_read_dx_leaf(struct inode *dir, u64 blkno,
@@ -812,11 +807,10 @@ static int ocfs2_dx_dir_lookup_rec(struct inode *inode, 
		el = &eb->h_list;



		if (el->l_tree_depth) {

			ocfs2_error(inode->i_sb,

			ret = ocfs2_error(inode->i_sb,

				    "Inode %lu has non zero tree depth in "

				    "btree tree block %llu\n", inode->i_ino,

				    (unsigned long long)eb_bh->b_blocknr);

			ret = -EROFS;

			goto out;

		}

	}
@@ -832,11 +826,10 @@ static int ocfs2_dx_dir_lookup_rec(struct inode *inode, 
	}



	if (!found) {

		ocfs2_error(inode->i_sb, "Inode %lu has bad extent "

		ret = ocfs2_error(inode->i_sb, "Inode %lu has bad extent "

			    "record (%u, %u, 0) in btree", inode->i_ino,

			    le32_to_cpu(rec->e_cpos),

			    ocfs2_rec_clusters(el, rec));

		ret = -EROFS;

		goto out;

	}

fs/ocfs2/inode.c

+4 −4
Original line number Diff line number Diff line
@@ -1352,21 +1352,21 @@ int ocfs2_validate_inode_block(struct super_block *sb, 
	rc = -EINVAL;



	if (!OCFS2_IS_VALID_DINODE(di)) {

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

		rc = ocfs2_error(sb, "Invalid dinode #%llu: signature = %.*s\n",

			    (unsigned long long)bh->b_blocknr, 7,

			    di->i_signature);

		goto bail;

	}



	if (le64_to_cpu(di->i_blkno) != bh->b_blocknr) {

		ocfs2_error(sb, "Invalid dinode #%llu: i_blkno is %llu\n",

		rc = ocfs2_error(sb, "Invalid dinode #%llu: i_blkno is %llu\n",

			    (unsigned long long)bh->b_blocknr,

			    (unsigned long long)le64_to_cpu(di->i_blkno));

		goto bail;

	}



	if (!(di->i_flags & cpu_to_le32(OCFS2_VALID_FL))) {

		ocfs2_error(sb,

		rc = ocfs2_error(sb,

			    "Invalid dinode #%llu: OCFS2_VALID_FL not set\n",

			    (unsigned long long)bh->b_blocknr);

		goto bail;
@@ -1374,7 +1374,7 @@ int ocfs2_validate_inode_block(struct super_block *sb, 


	if (le32_to_cpu(di->i_fs_generation) !=

	    OCFS2_SB(sb)->fs_generation) {

		ocfs2_error(sb,

		rc = ocfs2_error(sb,

			    "Invalid dinode #%llu: fs_generation is %u\n",

			    (unsigned long long)bh->b_blocknr,

			    le32_to_cpu(di->i_fs_generation));

fs/ocfs2/move_extents.c

+1 −2
Original line number Diff line number Diff line
@@ -99,11 +99,10 @@ static int __ocfs2_move_extent(handle_t *handle, 


	index = ocfs2_search_extent_list(el, cpos);

	if (index == -1) {

		ocfs2_error(inode->i_sb,

		ret = ocfs2_error(inode->i_sb,

			    "Inode %llu has an extent at cpos %u which can no "

			    "longer be found.\n",

			    (unsigned long long)ino, cpos);

		ret = -EROFS;

		goto out;

	}

fs/ocfs2/refcounttree.c

+18 −24
Original line number Diff line number Diff line
@@ -102,32 +102,32 @@ static int ocfs2_validate_refcount_block(struct super_block *sb, 




	if (!OCFS2_IS_VALID_REFCOUNT_BLOCK(rb)) {

		ocfs2_error(sb,

		rc = ocfs2_error(sb,

			    "Refcount block #%llu has bad signature %.*s",

			    (unsigned long long)bh->b_blocknr, 7,

			    rb->rf_signature);

		return -EINVAL;

		goto out;

	}



	if (le64_to_cpu(rb->rf_blkno) != bh->b_blocknr) {

		ocfs2_error(sb,

		rc = ocfs2_error(sb,

			    "Refcount block #%llu has an invalid rf_blkno "

			    "of %llu",

			    (unsigned long long)bh->b_blocknr,

			    (unsigned long long)le64_to_cpu(rb->rf_blkno));

		return -EINVAL;

		goto out;

	}



	if (le32_to_cpu(rb->rf_fs_generation) != OCFS2_SB(sb)->fs_generation) {

		ocfs2_error(sb,

		rc = ocfs2_error(sb,

			    "Refcount block #%llu has an invalid "

			    "rf_fs_generation of #%u",

			    (unsigned long long)bh->b_blocknr,

			    le32_to_cpu(rb->rf_fs_generation));

		return -EINVAL;

		goto out;

	}



	return 0;

out:

	return rc;

}



static int ocfs2_read_refcount_block(struct ocfs2_caching_info *ci,
@@ -1102,12 +1102,11 @@ static int ocfs2_get_refcount_rec(struct ocfs2_caching_info *ci, 
		el = &eb->h_list;



		if (el->l_tree_depth) {

			ocfs2_error(sb,

			ret = ocfs2_error(sb,

				"refcount tree %llu has non zero tree "

				"depth in leaf btree tree block %llu\n",

				(unsigned long long)ocfs2_metadata_cache_owner(ci),

				(unsigned long long)eb_bh->b_blocknr);

			ret = -EROFS;

			goto out;

		}

	}
@@ -2359,10 +2358,9 @@ static int ocfs2_mark_extent_refcounted(struct inode *inode, 
					   cpos, len, phys);



	if (!ocfs2_refcount_tree(OCFS2_SB(inode->i_sb))) {

		ocfs2_error(inode->i_sb, "Inode %lu want to use refcount "

		ret = ocfs2_error(inode->i_sb, "Inode %lu want to use refcount "

			    "tree, but the feature bit is not set in the "

			    "super block.", inode->i_ino);

		ret = -EROFS;

		goto out;

	}
@@ -2545,10 +2543,9 @@ int ocfs2_prepare_refcount_change_for_del(struct inode *inode, 
	u64 start_cpos = ocfs2_blocks_to_clusters(inode->i_sb, phys_blkno);



	if (!ocfs2_refcount_tree(OCFS2_SB(inode->i_sb))) {

		ocfs2_error(inode->i_sb, "Inode %lu want to use refcount "

		ret = ocfs2_error(inode->i_sb, "Inode %lu want to use refcount "

			    "tree, but the feature bit is not set in the "

			    "super block.", inode->i_ino);

		ret = -EROFS;

		goto out;

	}
@@ -2672,11 +2669,10 @@ static int ocfs2_refcount_cal_cow_clusters(struct inode *inode, 
		el = &eb->h_list;



		if (el->l_tree_depth) {

			ocfs2_error(inode->i_sb,

			ret = ocfs2_error(inode->i_sb,

				    "Inode %lu has non zero tree depth in "

				    "leaf block %llu\n", inode->i_ino,

				    (unsigned long long)eb_bh->b_blocknr);

			ret = -EROFS;

			goto out;

		}

	}
@@ -3106,11 +3102,10 @@ static int ocfs2_clear_ext_refcount(handle_t *handle, 


	index = ocfs2_search_extent_list(el, cpos);

	if (index == -1) {

		ocfs2_error(sb,

		ret = ocfs2_error(sb,

			    "Inode %llu has an extent at cpos %u which can no "

			    "longer be found.\n",

			    (unsigned long long)ino, cpos);

		ret = -EROFS;

		goto out;

	}
@@ -3376,10 +3371,9 @@ static int ocfs2_replace_cow(struct ocfs2_cow_context *context) 
	struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);



	if (!ocfs2_refcount_tree(OCFS2_SB(inode->i_sb))) {

		ocfs2_error(inode->i_sb, "Inode %lu want to use refcount "

		return ocfs2_error(inode->i_sb, "Inode %lu want to use refcount "

			    "tree, but the feature bit is not set in the "

			    "super block.", inode->i_ino);

		return -EROFS;

	}



	ocfs2_init_dealloc_ctxt(&context->dealloc);