Commit 7ecef14a authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

ocfs2: neaten do_error, ocfs2_error and ocfs2_abort 



These uses sometimes do and sometimes don't have '\n' terminations.  Make
the uses consistently use '\n' terminations and remove the newline from
the functions.

Miscellanea:

o Coalesce formats
o Realign arguments

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Reviewed-by: default avatarMark Fasheh <mfasheh@suse.de>
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 d0c97d52

fs/ocfs2/alloc.c

+32 −54
Original line number Diff line number Diff line
@@ -909,7 +909,7 @@ static int ocfs2_validate_extent_block(struct super_block *sb, 


	if (!OCFS2_IS_VALID_EXTENT_BLOCK(eb)) {

		rc = ocfs2_error(sb,

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

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

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

				 eb->h_signature);

		goto bail;
@@ -917,8 +917,7 @@ static int ocfs2_validate_extent_block(struct super_block *sb, 


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

		rc = ocfs2_error(sb,

			    "Extent block #%llu has an invalid h_blkno "

			    "of %llu",

				 "Extent block #%llu has an invalid h_blkno of %llu\n",

				 (unsigned long long)bh->b_blocknr,

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

		goto bail;
@@ -926,8 +925,7 @@ static int ocfs2_validate_extent_block(struct super_block *sb, 


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

		rc = ocfs2_error(sb,

			    "Extent block #%llu has an invalid "

			    "h_fs_generation of #%u",

				 "Extent block #%llu has an invalid h_fs_generation of #%u\n",

				 (unsigned long long)bh->b_blocknr,

				 le32_to_cpu(eb->h_fs_generation));

		goto bail;
@@ -1446,8 +1444,7 @@ static int ocfs2_find_branch_target(struct ocfs2_extent_tree *et, 
	while(le16_to_cpu(el->l_tree_depth) > 1) {

		if (le16_to_cpu(el->l_next_free_rec) == 0) {

			ocfs2_error(ocfs2_metadata_cache_get_super(et->et_ci),

				    "Owner %llu has empty "

				    "extent list (next_free_rec == 0)",

				    "Owner %llu has empty extent list (next_free_rec == 0)\n",

				    (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci));

			status = -EIO;

			goto bail;
@@ -1456,9 +1453,7 @@ static int ocfs2_find_branch_target(struct ocfs2_extent_tree *et, 
		blkno = le64_to_cpu(el->l_recs[i].e_blkno);

		if (!blkno) {

			ocfs2_error(ocfs2_metadata_cache_get_super(et->et_ci),

				    "Owner %llu has extent "

				    "list where extent # %d has no physical "

				    "block start",

				    "Owner %llu has extent list where extent # %d has no physical block start\n",

				    (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci), i);

			status = -EIO;

			goto bail;
@@ -1788,8 +1783,7 @@ static int __ocfs2_find_path(struct ocfs2_caching_info *ci, 
	while (el->l_tree_depth) {

		if (le16_to_cpu(el->l_next_free_rec) == 0) {

			ocfs2_error(ocfs2_metadata_cache_get_super(ci),

				    "Owner %llu has empty extent list at "

				    "depth %u\n",

				    "Owner %llu has empty extent list at depth %u\n",

				    (unsigned long long)ocfs2_metadata_cache_owner(ci),

				    le16_to_cpu(el->l_tree_depth));

			ret = -EROFS;
@@ -1814,8 +1808,7 @@ static int __ocfs2_find_path(struct ocfs2_caching_info *ci, 
		blkno = le64_to_cpu(el->l_recs[i].e_blkno);

		if (blkno == 0) {

			ocfs2_error(ocfs2_metadata_cache_get_super(ci),

				    "Owner %llu has bad blkno in extent list "

				    "at depth %u (index %d)\n",

				    "Owner %llu has bad blkno in extent list at depth %u (index %d)\n",

				    (unsigned long long)ocfs2_metadata_cache_owner(ci),

				    le16_to_cpu(el->l_tree_depth), i);

			ret = -EROFS;
@@ -1836,8 +1829,7 @@ static int __ocfs2_find_path(struct ocfs2_caching_info *ci, 
		if (le16_to_cpu(el->l_next_free_rec) >

		    le16_to_cpu(el->l_count)) {

			ocfs2_error(ocfs2_metadata_cache_get_super(ci),

				    "Owner %llu has bad count in extent list "

				    "at block %llu (next free=%u, count=%u)\n",

				    "Owner %llu has bad count in extent list at block %llu (next free=%u, count=%u)\n",

				    (unsigned long long)ocfs2_metadata_cache_owner(ci),

				    (unsigned long long)bh->b_blocknr,

				    le16_to_cpu(el->l_next_free_rec),
@@ -2116,8 +2108,7 @@ static int ocfs2_rotate_subtree_right(handle_t *handle, 


	if (left_el->l_next_free_rec != left_el->l_count) {

		ocfs2_error(ocfs2_metadata_cache_get_super(et->et_ci),

			    "Inode %llu has non-full interior leaf node %llu"

			    "(next free = %u)",

			    "Inode %llu has non-full interior leaf node %llu (next free = %u)\n",

			    (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci),

			    (unsigned long long)left_leaf_bh->b_blocknr,

			    le16_to_cpu(left_el->l_next_free_rec));
@@ -2256,8 +2247,7 @@ int ocfs2_find_cpos_for_left_leaf(struct super_block *sb, 
		 * If we got here, we never found a valid node where

		 * the tree indicated one should be.

		 */

		ocfs2_error(sb,

			    "Invalid extent tree at extent block %llu\n",

		ocfs2_error(sb, "Invalid extent tree at extent block %llu\n",

			    (unsigned long long)blkno);

		ret = -EROFS;

		goto out;
@@ -2872,8 +2862,7 @@ int ocfs2_find_cpos_for_right_leaf(struct super_block *sb, 
		 * If we got here, we never found a valid node where

		 * the tree indicated one should be.

		 */

		ocfs2_error(sb,

			    "Invalid extent tree at extent block %llu\n",

		ocfs2_error(sb, "Invalid extent tree at extent block %llu\n",

			    (unsigned long long)blkno);

		ret = -EROFS;

		goto out;
@@ -3224,7 +3213,7 @@ rightmost_no_delete: 
		if (le16_to_cpu(el->l_next_free_rec) == 0) {

			ret = -EIO;

			ocfs2_error(ocfs2_metadata_cache_get_super(et->et_ci),

				    "Owner %llu has empty extent block at %llu",

				    "Owner %llu has empty extent block at %llu\n",

				    (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci),

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

			goto out;
@@ -3954,7 +3943,7 @@ static void ocfs2_adjust_rightmost_records(handle_t *handle, 
		next_free = le16_to_cpu(el->l_next_free_rec);

		if (next_free == 0) {

			ocfs2_error(ocfs2_metadata_cache_get_super(et->et_ci),

				    "Owner %llu has a bad extent list",

				    "Owner %llu has a bad extent list\n",

				    (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci));

			ret = -EIO;

			return;
@@ -4379,10 +4368,7 @@ static int ocfs2_figure_merge_contig_type(struct ocfs2_extent_tree *et, 
				bh = path_leaf_bh(left_path);

				eb = (struct ocfs2_extent_block *)bh->b_data;

				ocfs2_error(sb,

					    "Extent block #%llu has an "

					    "invalid l_next_free_rec of "

					    "%d.  It should have "

					    "matched the l_count of %d",

					    "Extent block #%llu has an invalid l_next_free_rec of %d.  It should have matched the l_count of %d\n",

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

					    le16_to_cpu(new_el->l_next_free_rec),

					    le16_to_cpu(new_el->l_count));
@@ -4437,8 +4423,7 @@ static int ocfs2_figure_merge_contig_type(struct ocfs2_extent_tree *et, 
				bh = path_leaf_bh(right_path);

				eb = (struct ocfs2_extent_block *)bh->b_data;

				ocfs2_error(sb,

					    "Extent block #%llu has an "

					    "invalid l_next_free_rec of %d",

					    "Extent block #%llu has an invalid l_next_free_rec of %d\n",

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

					    le16_to_cpu(new_el->l_next_free_rec));

				status = -EINVAL;
@@ -4994,8 +4979,7 @@ leftright: 
		split_index = ocfs2_search_extent_list(el, cpos);

		if (split_index == -1) {

			ocfs2_error(ocfs2_metadata_cache_get_super(et->et_ci),

					"Owner %llu has an extent at cpos %u "

					"which can no longer be found.\n",

				    "Owner %llu has an extent at cpos %u which can no longer be found\n",

				    (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci),

				    cpos);

			ret = -EROFS;
@@ -5182,10 +5166,9 @@ int ocfs2_change_extent_flag(handle_t *handle, 
	index = ocfs2_search_extent_list(el, cpos);

	if (index == -1) {

		ocfs2_error(sb,

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

			    "longer be found.\n",

			     (unsigned long long)

			     ocfs2_metadata_cache_owner(et->et_ci), cpos);

			    "Owner %llu has an extent at cpos %u which can no longer be found\n",

			    (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci),

			    cpos);

		ret = -EROFS;

		goto out;

	}
@@ -5252,9 +5235,7 @@ int ocfs2_mark_extent_written(struct inode *inode, 
		cpos, len, phys);



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

		ocfs2_error(inode->i_sb, "Inode %llu has unwritten extents "

			    "that are being written to, but the feature bit "

			    "is not set in the super block.",

		ocfs2_error(inode->i_sb, "Inode %llu has unwritten extents that are being written to, but the feature bit is not set in the super block\n",

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

		ret = -EROFS;

		goto out;
@@ -5538,8 +5519,7 @@ int ocfs2_remove_extent(handle_t *handle, 
	index = ocfs2_search_extent_list(el, cpos);

	if (index == -1) {

		ocfs2_error(ocfs2_metadata_cache_get_super(et->et_ci),

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

			    "longer be found.\n",

			    "Owner %llu has an extent at cpos %u which can no longer be found\n",

			    (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci),

			    cpos);

		ret = -EROFS;
@@ -5604,7 +5584,7 @@ int ocfs2_remove_extent(handle_t *handle, 
		index = ocfs2_search_extent_list(el, cpos);

		if (index == -1) {

			ocfs2_error(ocfs2_metadata_cache_get_super(et->et_ci),

				    "Owner %llu: split at cpos %u lost record.",

				    "Owner %llu: split at cpos %u lost record\n",

				    (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci),

				    cpos);

			ret = -EROFS;
@@ -5620,8 +5600,7 @@ int ocfs2_remove_extent(handle_t *handle, 
			ocfs2_rec_clusters(el, rec);

		if (rec_range != trunc_range) {

			ocfs2_error(ocfs2_metadata_cache_get_super(et->et_ci),

				    "Owner %llu: error after split at cpos %u"

				    "trunc len %u, existing record is (%u,%u)",

				    "Owner %llu: error after split at cpos %u trunc len %u, existing record is (%u,%u)\n",

				    (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci),

				    cpos, len, le32_to_cpu(rec->e_cpos),

				    ocfs2_rec_clusters(el, rec));
@@ -7236,8 +7215,7 @@ int ocfs2_truncate_inline(struct inode *inode, struct buffer_head *di_bh, 
	    !(le16_to_cpu(di->i_dyn_features) & OCFS2_INLINE_DATA_FL) ||

	    !ocfs2_supports_inline_data(osb)) {

		ocfs2_error(inode->i_sb,

			    "Inline data flags for inode %llu don't agree! "

			    "Disk: 0x%x, Memory: 0x%x, Superblock: 0x%x\n",

			    "Inline data flags for inode %llu don't agree! Disk: 0x%x, Memory: 0x%x, Superblock: 0x%x\n",

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

			    le16_to_cpu(di->i_dyn_features),

			    OCFS2_I(inode)->ip_dyn_features,

fs/ocfs2/aops.c

+2 −2
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ int ocfs2_read_inline_data(struct inode *inode, struct page *page, 
	struct ocfs2_dinode *di = (struct ocfs2_dinode *)di_bh->b_data;



	if (!(le16_to_cpu(di->i_dyn_features) & OCFS2_INLINE_DATA_FL)) {

		ocfs2_error(inode->i_sb, "Inode %llu lost inline data flag",

		ocfs2_error(inode->i_sb, "Inode %llu lost inline data flag\n",

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

		return -EROFS;

	}
@@ -237,7 +237,7 @@ int ocfs2_read_inline_data(struct inode *inode, struct page *page, 
	if (size > PAGE_CACHE_SIZE ||

	    size > ocfs2_max_inline_data_with_xattr(inode->i_sb, di)) {

		ocfs2_error(inode->i_sb,

			    "Inode %llu has with inline data has bad size: %Lu",

			    "Inode %llu has with inline data has bad size: %Lu\n",

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

			    (unsigned long long)size);

		return -EROFS;

fs/ocfs2/dir.c

+23 −26
Original line number Diff line number Diff line
@@ -481,16 +481,14 @@ 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 = ocfs2_error(dir->i_sb,

			    "Invalid dirblock #%llu: "

			    "signature = %.*s\n",

				 "Invalid dirblock #%llu: signature = %.*s\n",

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

				 trailer->db_signature);

		goto out;

	}

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

		rc = ocfs2_error(dir->i_sb,

			    "Directory block #%llu has an invalid "

			    "db_blkno of %llu",

				 "Directory block #%llu has an invalid db_blkno of %llu\n",

				 (unsigned long long)bh->b_blocknr,

				 (unsigned long long)le64_to_cpu(trailer->db_blkno));

		goto out;
@@ -498,9 +496,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 = ocfs2_error(dir->i_sb,

			    "Directory block #%llu on dinode "

			    "#%llu has an invalid parent_dinode "

			    "of %llu",

				 "Directory block #%llu on dinode #%llu has an invalid parent_dinode of %llu\n",

				 (unsigned long long)bh->b_blocknr,

				 (unsigned long long)OCFS2_I(dir)->ip_blkno,

				 (unsigned long long)le64_to_cpu(trailer->db_blkno));
@@ -602,7 +598,7 @@ static int ocfs2_validate_dx_root(struct super_block *sb, 


	if (!OCFS2_IS_VALID_DX_ROOT(dx_root)) {

		ret = ocfs2_error(sb,

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

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

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

				  7, dx_root->dr_signature);

	}
@@ -644,7 +640,7 @@ static int ocfs2_validate_dx_leaf(struct super_block *sb, 
	}



	if (!OCFS2_IS_VALID_DX_LEAF(dx_leaf)) {

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

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

				  7, dx_leaf->dl_signature);

	}
@@ -808,8 +804,8 @@ static int ocfs2_dx_dir_lookup_rec(struct inode *inode, 


		if (el->l_tree_depth) {

			ret = ocfs2_error(inode->i_sb,

				    "Inode %lu has non zero tree depth in "

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

					  "Inode %lu has non zero tree depth in btree tree block %llu\n",

					  inode->i_ino,

					  (unsigned long long)eb_bh->b_blocknr);

			goto out;

		}
@@ -826,8 +822,9 @@ static int ocfs2_dx_dir_lookup_rec(struct inode *inode, 
	}



	if (!found) {

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

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

		ret = ocfs2_error(inode->i_sb,

				  "Inode %lu has bad extent record (%u, %u, 0) in btree\n",

				  inode->i_ino,

				  le32_to_cpu(rec->e_cpos),

				  ocfs2_rec_clusters(el, rec));

		goto out;

fs/ocfs2/extent_map.c

+12 −10
Original line number Diff line number Diff line
@@ -305,8 +305,8 @@ static int ocfs2_last_eb_is_empty(struct inode *inode, 


	if (el->l_tree_depth) {

		ocfs2_error(inode->i_sb,

			    "Inode %lu has non zero tree depth in "

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

			    "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;
@@ -441,8 +441,8 @@ static int ocfs2_get_clusters_nocache(struct inode *inode, 


		if (el->l_tree_depth) {

			ocfs2_error(inode->i_sb,

				    "Inode %lu has non zero tree depth in "

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

				    "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;
@@ -475,8 +475,9 @@ static int ocfs2_get_clusters_nocache(struct inode *inode, 
	BUG_ON(v_cluster < le32_to_cpu(rec->e_cpos));



	if (!rec->e_blkno) {

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

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

		ocfs2_error(inode->i_sb,

			    "Inode %lu has bad extent record (%u, %u, 0)\n",

			    inode->i_ino,

			    le32_to_cpu(rec->e_cpos),

			    ocfs2_rec_clusters(el, rec));

		ret = -EROFS;
@@ -564,8 +565,8 @@ int ocfs2_xattr_get_clusters(struct inode *inode, u32 v_cluster, 


		if (el->l_tree_depth) {

			ocfs2_error(inode->i_sb,

				    "Inode %lu has non zero tree depth in "

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

				    "Inode %lu has non zero tree depth in xattr leaf block %llu\n",

				    inode->i_ino,

				    (unsigned long long)eb_bh->b_blocknr);

			ret = -EROFS;

			goto out;
@@ -582,8 +583,9 @@ int ocfs2_xattr_get_clusters(struct inode *inode, u32 v_cluster, 
		BUG_ON(v_cluster < le32_to_cpu(rec->e_cpos));



		if (!rec->e_blkno) {

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

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

			ocfs2_error(inode->i_sb,

				    "Inode %lu has bad extent record (%u, %u, 0) in xattr\n",

				    inode->i_ino,

				    le32_to_cpu(rec->e_cpos),

				    ocfs2_rec_clusters(el, rec));

			ret = -EROFS;

fs/ocfs2/journal.c

+1 −1
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ handle_t *ocfs2_start_trans(struct ocfs2_super *osb, int max_buffs) 
		mlog_errno(PTR_ERR(handle));



		if (is_journal_aborted(journal)) {

			ocfs2_abort(osb->sb, "Detected aborted journal");

			ocfs2_abort(osb->sb, "Detected aborted journal\n");

			handle = ERR_PTR(-EROFS);

		}

	} else {

CRA Git | Maintained and supported by SUSTech CRA and CCSE