Commit ec20cec7 authored by Joel Becker's avatar Joel Becker
Browse files

ocfs2: Make ocfs2_journal_dirty() void. 



jbd[2]_journal_dirty_metadata() only returns 0.  It's been returning 0
since before the kernel moved to git.  There is no point in checking
this error.

ocfs2_journal_dirty() has been faithfully returning the status since the
beginning.  All over ocfs2, we have blocks of code checking this can't
fail status.  In the past few years, we've tried to avoid adding these
checks, because they are pointless.  But anyone who looks at our code
assumes they are needed.

Finally, ocfs2_journal_dirty() is made a void function.  All error
checking is removed from other files.  We'll BUG_ON() the status of
jbd2_journal_dirty_metadata() just in case they change it someday.  They
won't.

Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
parent b4414eea

fs/ocfs2/alloc.c

+34 −130
Original line number Diff line number Diff line
@@ -1061,11 +1061,7 @@ static int ocfs2_create_new_meta_bhs(handle_t *handle, 


			/* We'll also be dirtied by the caller, so

			 * this isn't absolutely necessary. */

			status = ocfs2_journal_dirty(handle, bhs[i]);

			if (status < 0) {

				mlog_errno(status);

				goto bail;

			}

			ocfs2_journal_dirty(handle, bhs[i]);

		}



		count += num_got;
@@ -1270,12 +1266,7 @@ static int ocfs2_add_branch(handle_t *handle, 
		if (!eb_el->l_tree_depth)

			new_last_eb_blk = le64_to_cpu(eb->h_blkno);



		status = ocfs2_journal_dirty(handle, bh);

		if (status < 0) {

			mlog_errno(status);

			goto bail;

		}



		ocfs2_journal_dirty(handle, bh);

		next_blkno = le64_to_cpu(eb->h_blkno);

	}
@@ -1321,17 +1312,10 @@ static int ocfs2_add_branch(handle_t *handle, 
	eb = (struct ocfs2_extent_block *) (*last_eb_bh)->b_data;

	eb->h_next_leaf_blk = cpu_to_le64(new_last_eb_blk);



	status = ocfs2_journal_dirty(handle, *last_eb_bh);

	if (status < 0)

		mlog_errno(status);

	status = ocfs2_journal_dirty(handle, et->et_root_bh);

	if (status < 0)

		mlog_errno(status);

	if (eb_bh) {

		status = ocfs2_journal_dirty(handle, eb_bh);

		if (status < 0)

			mlog_errno(status);

	}

	ocfs2_journal_dirty(handle, *last_eb_bh);

	ocfs2_journal_dirty(handle, et->et_root_bh);

	if (eb_bh)

		ocfs2_journal_dirty(handle, eb_bh);



	/*

	 * Some callers want to track the rightmost leaf so pass it
@@ -1399,11 +1383,7 @@ static int ocfs2_shift_tree_depth(handle_t *handle, 
	for (i = 0; i < le16_to_cpu(root_el->l_next_free_rec); i++)

		eb_el->l_recs[i] = root_el->l_recs[i];



	status = ocfs2_journal_dirty(handle, new_eb_bh);

	if (status < 0) {

		mlog_errno(status);

		goto bail;

	}

	ocfs2_journal_dirty(handle, new_eb_bh);



	status = ocfs2_et_root_journal_access(handle, et,

					      OCFS2_JOURNAL_ACCESS_WRITE);
@@ -1428,11 +1408,7 @@ static int ocfs2_shift_tree_depth(handle_t *handle, 
	if (root_el->l_tree_depth == cpu_to_le16(1))

		ocfs2_et_set_last_eb_blk(et, le64_to_cpu(eb->h_blkno));



	status = ocfs2_journal_dirty(handle, et->et_root_bh);

	if (status < 0) {

		mlog_errno(status);

		goto bail;

	}

	ocfs2_journal_dirty(handle, et->et_root_bh);



	*ret_new_eb_bh = new_eb_bh;

	new_eb_bh = NULL;
@@ -2064,7 +2040,7 @@ static void ocfs2_complete_edge_insert(handle_t *handle, 
				       struct ocfs2_path *right_path,

				       int subtree_index)

{

	int ret, i, idx;

	int i, idx;

	struct ocfs2_extent_list *el, *left_el, *right_el;

	struct ocfs2_extent_rec *left_rec, *right_rec;

	struct buffer_head *root_bh = left_path->p_node[subtree_index].bh;
@@ -2102,13 +2078,8 @@ static void ocfs2_complete_edge_insert(handle_t *handle, 
		ocfs2_adjust_adjacent_records(left_rec, left_el, right_rec,

					      right_el);



		ret = ocfs2_journal_dirty(handle, left_path->p_node[i].bh);

		if (ret)

			mlog_errno(ret);



		ret = ocfs2_journal_dirty(handle, right_path->p_node[i].bh);

		if (ret)

			mlog_errno(ret);

		ocfs2_journal_dirty(handle, left_path->p_node[i].bh);

		ocfs2_journal_dirty(handle, right_path->p_node[i].bh);



		/*

		 * Setup our list pointers now so that the current
@@ -2132,9 +2103,7 @@ static void ocfs2_complete_edge_insert(handle_t *handle, 


	root_bh = left_path->p_node[subtree_index].bh;



	ret = ocfs2_journal_dirty(handle, root_bh);

	if (ret)

		mlog_errno(ret);

	ocfs2_journal_dirty(handle, root_bh);

}



static int ocfs2_rotate_subtree_right(handle_t *handle,
@@ -2207,11 +2176,7 @@ static int ocfs2_rotate_subtree_right(handle_t *handle, 


	ocfs2_create_empty_extent(right_el);



	ret = ocfs2_journal_dirty(handle, right_leaf_bh);

	if (ret) {

		mlog_errno(ret);

		goto out;

	}

	ocfs2_journal_dirty(handle, right_leaf_bh);



	/* Do the copy now. */

	i = le16_to_cpu(left_el->l_next_free_rec) - 1;
@@ -2230,11 +2195,7 @@ static int ocfs2_rotate_subtree_right(handle_t *handle, 
	memset(&left_el->l_recs[0], 0, sizeof(struct ocfs2_extent_rec));

	le16_add_cpu(&left_el->l_next_free_rec, 1);



	ret = ocfs2_journal_dirty(handle, left_leaf_bh);

	if (ret) {

		mlog_errno(ret);

		goto out;

	}

	ocfs2_journal_dirty(handle, left_leaf_bh);



	ocfs2_complete_edge_insert(handle, left_path, right_path,

				   subtree_index);
@@ -2823,12 +2784,8 @@ static int ocfs2_rotate_subtree_left(handle_t *handle, 
		ocfs2_remove_empty_extent(right_leaf_el);

	}



	ret = ocfs2_journal_dirty(handle, path_leaf_bh(left_path));

	if (ret)

		mlog_errno(ret);

	ret = ocfs2_journal_dirty(handle, path_leaf_bh(right_path));

	if (ret)

		mlog_errno(ret);

	ocfs2_journal_dirty(handle, path_leaf_bh(left_path));

	ocfs2_journal_dirty(handle, path_leaf_bh(right_path));



	if (del_right_subtree) {

		ocfs2_unlink_subtree(handle, et, left_path, right_path,
@@ -2851,9 +2808,7 @@ static int ocfs2_rotate_subtree_left(handle_t *handle, 
		if (right_has_empty)

			ocfs2_remove_empty_extent(left_leaf_el);



		ret = ocfs2_journal_dirty(handle, et_root_bh);

		if (ret)

			mlog_errno(ret);

		ocfs2_journal_dirty(handle, et_root_bh);



		*deleted = 1;

	} else
@@ -2962,10 +2917,7 @@ static int ocfs2_rotate_rightmost_leaf_left(handle_t *handle, 
	}



	ocfs2_remove_empty_extent(el);



	ret = ocfs2_journal_dirty(handle, bh);

	if (ret)

		mlog_errno(ret);

	ocfs2_journal_dirty(handle, bh);



out:

	return ret;
@@ -3506,15 +3458,9 @@ static int ocfs2_merge_rec_right(struct ocfs2_path *left_path, 


	ocfs2_cleanup_merge(el, index);



	ret = ocfs2_journal_dirty(handle, bh);

	if (ret)

		mlog_errno(ret);



	ocfs2_journal_dirty(handle, bh);

	if (right_path) {

		ret = ocfs2_journal_dirty(handle, path_leaf_bh(right_path));

		if (ret)

			mlog_errno(ret);



		ocfs2_journal_dirty(handle, path_leaf_bh(right_path));

		ocfs2_complete_edge_insert(handle, left_path, right_path,

					   subtree_index);

	}
@@ -3683,14 +3629,9 @@ static int ocfs2_merge_rec_left(struct ocfs2_path *right_path, 


	ocfs2_cleanup_merge(el, index);



	ret = ocfs2_journal_dirty(handle, bh);

	if (ret)

		mlog_errno(ret);



	ocfs2_journal_dirty(handle, bh);

	if (left_path) {

		ret = ocfs2_journal_dirty(handle, path_leaf_bh(left_path));

		if (ret)

			mlog_errno(ret);

		ocfs2_journal_dirty(handle, path_leaf_bh(left_path));



		/*

		 * In the situation that the right_rec is empty and the extent
@@ -4016,10 +3957,7 @@ static void ocfs2_adjust_rightmost_records(handle_t *handle, 
		le32_add_cpu(&rec->e_int_clusters,

			     -le32_to_cpu(rec->e_cpos));



		ret = ocfs2_journal_dirty(handle, bh);

		if (ret)

			mlog_errno(ret);



		ocfs2_journal_dirty(handle, bh);

	}

}
@@ -4251,17 +4189,13 @@ static int ocfs2_insert_path(handle_t *handle, 
		 * dirty this for us.

		 */

		if (left_path)

			ret = ocfs2_journal_dirty(handle,

			ocfs2_journal_dirty(handle,

					    path_leaf_bh(left_path));

			if (ret)

				mlog_errno(ret);

	} else

		ocfs2_insert_at_leaf(et, insert_rec, path_leaf_el(right_path),

				     insert);



	ret = ocfs2_journal_dirty(handle, leaf_bh);

	if (ret)

		mlog_errno(ret);

	ocfs2_journal_dirty(handle, leaf_bh);



	if (left_path) {

		/*
@@ -4384,9 +4318,7 @@ out_update_clusters: 
		ocfs2_et_update_clusters(et,

					 le16_to_cpu(insert_rec->e_leaf_clusters));



	ret = ocfs2_journal_dirty(handle, et->et_root_bh);

	if (ret)

		mlog_errno(ret);

	ocfs2_journal_dirty(handle, et->et_root_bh);



out:

	ocfs2_free_path(left_path);
@@ -4895,11 +4827,7 @@ int ocfs2_add_clusters_in_btree(handle_t *handle, 
		goto leave;

	}



	status = ocfs2_journal_dirty(handle, et->et_root_bh);

	if (status < 0) {

		mlog_errno(status);

		goto leave;

	}

	ocfs2_journal_dirty(handle, et->et_root_bh);



	clusters_to_add -= num_bits;

	*logical_offset += num_bits;
@@ -5724,11 +5652,7 @@ int ocfs2_remove_btree_range(struct inode *inode, 


	ocfs2_et_update_clusters(et, -len);



	ret = ocfs2_journal_dirty(handle, et->et_root_bh);

	if (ret) {

		mlog_errno(ret);

		goto out_commit;

	}

	ocfs2_journal_dirty(handle, et->et_root_bh);



	ret = ocfs2_truncate_log_append(osb, handle, phys_blkno, len);

	if (ret)
@@ -5850,11 +5774,7 @@ int ocfs2_truncate_log_append(struct ocfs2_super *osb, 
	}

	tl->tl_recs[index].t_clusters = cpu_to_le32(num_clusters);



	status = ocfs2_journal_dirty(handle, tl_bh);

	if (status < 0) {

		mlog_errno(status);

		goto bail;

	}

	ocfs2_journal_dirty(handle, tl_bh);



bail:

	mlog_exit(status);
@@ -5893,11 +5813,7 @@ static int ocfs2_replay_truncate_records(struct ocfs2_super *osb, 


		tl->tl_used = cpu_to_le16(i);



		status = ocfs2_journal_dirty(handle, tl_bh);

		if (status < 0) {

			mlog_errno(status);

			goto bail;

		}

		ocfs2_journal_dirty(handle, tl_bh);



		/* TODO: Perhaps we can calculate the bulk of the

		 * credits up front rather than extending like
@@ -6824,11 +6740,7 @@ find_tail_record: 
		}



delete:

		ret = ocfs2_journal_dirty(handle, bh);

		if (ret) {

			mlog_errno(ret);

			goto out;

		}

		ocfs2_journal_dirty(handle, bh);



		mlog(0, "extent list container %llu, after: record %d: "

		     "(%u, %u, %llu), next = %u.\n",
@@ -6959,22 +6871,14 @@ static int ocfs2_do_truncate(struct ocfs2_super *osb, 
	} else if (last_eb)

		fe->i_last_eb_blk = last_eb->h_blkno;



	status = ocfs2_journal_dirty(handle, fe_bh);

	if (status < 0) {

		mlog_errno(status);

		goto bail;

	}

	ocfs2_journal_dirty(handle, fe_bh);



	if (last_eb) {

		/* If there will be a new last extent block, then by

		 * definition, there cannot be any leaves to the right of

		 * him. */

		last_eb->h_next_leaf_blk = 0;

		status = ocfs2_journal_dirty(handle, last_eb_bh);

		if (status < 0) {

			mlog_errno(status);

			goto bail;

		}

		ocfs2_journal_dirty(handle, last_eb_bh);

	}



	if (delete_blk) {

fs/ocfs2/dir.c

+9 −39
Original line number Diff line number Diff line
@@ -1194,7 +1194,7 @@ static int __ocfs2_delete_entry(handle_t *handle, struct inode *dir, 
			else

				de->inode = 0;

			dir->i_version++;

			status = ocfs2_journal_dirty(handle, bh);

			ocfs2_journal_dirty(handle, bh);

			goto bail;

		}

		i += le16_to_cpu(de->rec_len);
@@ -1752,7 +1752,7 @@ int __ocfs2_add_entry(handle_t *handle, 
				ocfs2_recalc_free_list(dir, handle, lookup);



			dir->i_version++;

			status = ocfs2_journal_dirty(handle, insert_bh);

			ocfs2_journal_dirty(handle, insert_bh);

			retval = 0;

			goto bail;

		}
@@ -2297,12 +2297,7 @@ static int ocfs2_fill_new_dir_id(struct ocfs2_super *osb, 
	}



	ocfs2_fill_initial_dirents(inode, parent, data->id_data, size);



	ocfs2_journal_dirty(handle, di_bh);

	if (ret) {

		mlog_errno(ret);

		goto out;

	}



	i_size_write(inode, size);

	inode->i_nlink = 2;
@@ -2366,11 +2361,7 @@ static int ocfs2_fill_new_dir_el(struct ocfs2_super *osb, 
		ocfs2_init_dir_trailer(inode, new_bh, size);

	}



	status = ocfs2_journal_dirty(handle, new_bh);

	if (status < 0) {

		mlog_errno(status);

		goto bail;

	}

	ocfs2_journal_dirty(handle, new_bh);



	i_size_write(inode, inode->i_sb->s_blocksize);

	inode->i_nlink = 2;
@@ -2458,10 +2449,7 @@ static int ocfs2_dx_dir_attach_index(struct ocfs2_super *osb, 
		dx_root->dr_list.l_count =

			cpu_to_le16(ocfs2_extent_recs_per_dx_root(osb->sb));

	}



	ret = ocfs2_journal_dirty(handle, dx_root_bh);

	if (ret)

		mlog_errno(ret);

	ocfs2_journal_dirty(handle, dx_root_bh);



	ret = ocfs2_journal_access_di(handle, INODE_CACHE(dir), di_bh,

				      OCFS2_JOURNAL_ACCESS_CREATE);
@@ -2475,9 +2463,7 @@ static int ocfs2_dx_dir_attach_index(struct ocfs2_super *osb, 
	OCFS2_I(dir)->ip_dyn_features |= OCFS2_INDEXED_DIR_FL;

	di->i_dyn_features = cpu_to_le16(OCFS2_I(dir)->ip_dyn_features);



	ret = ocfs2_journal_dirty(handle, di_bh);

	if (ret)

		mlog_errno(ret);

	ocfs2_journal_dirty(handle, di_bh);



	*ret_dx_root_bh = dx_root_bh;

	dx_root_bh = NULL;
@@ -3034,11 +3020,7 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh, 
		ocfs2_init_dir_trailer(dir, dirdata_bh, i);

	}



	ret = ocfs2_journal_dirty(handle, dirdata_bh);

	if (ret) {

		mlog_errno(ret);

		goto out_commit;

	}

	ocfs2_journal_dirty(handle, dirdata_bh);



	if (ocfs2_supports_indexed_dirs(osb) && !dx_inline) {

		/*
@@ -3104,11 +3086,7 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh, 
	 */

	dir->i_blocks = ocfs2_inode_sector_count(dir);



	ret = ocfs2_journal_dirty(handle, di_bh);

	if (ret) {

		mlog_errno(ret);

		goto out_commit;

	}

	ocfs2_journal_dirty(handle, di_bh);



	if (ocfs2_supports_indexed_dirs(osb)) {

		ret = ocfs2_dx_dir_attach_index(osb, handle, dir, di_bh,
@@ -3423,11 +3401,7 @@ do_extend: 
	} else {

		de->rec_len = cpu_to_le16(sb->s_blocksize);

	}

	status = ocfs2_journal_dirty(handle, new_bh);

	if (status < 0) {

		mlog_errno(status);

		goto bail;

	}

	ocfs2_journal_dirty(handle, new_bh);



	dir_i_size += dir->i_sb->s_blocksize;

	i_size_write(dir, dir_i_size);
@@ -3906,11 +3880,7 @@ static int ocfs2_dx_dir_rebalance(struct ocfs2_super *osb, struct inode *dir, 
	     sizeof(struct ocfs2_dx_entry), dx_leaf_sort_cmp,

	     dx_leaf_sort_swap);



	ret = ocfs2_journal_dirty(handle, dx_leaf_bh);

	if (ret) {

		mlog_errno(ret);

		goto out_commit;

	}

	ocfs2_journal_dirty(handle, dx_leaf_bh);



	ret = ocfs2_dx_dir_find_leaf_split(dx_leaf, leaf_cpos, insert_hash,

					   &split_hash);

fs/ocfs2/file.c

+4 −15
Original line number Diff line number Diff line
@@ -278,10 +278,7 @@ int ocfs2_update_inode_atime(struct inode *inode, 
	inode->i_atime = CURRENT_TIME;

	di->i_atime = cpu_to_le64(inode->i_atime.tv_sec);

	di->i_atime_nsec = cpu_to_le32(inode->i_atime.tv_nsec);



	ret = ocfs2_journal_dirty(handle, bh);

	if (ret < 0)

		mlog_errno(ret);

	ocfs2_journal_dirty(handle, bh);



out_commit:

	ocfs2_commit_trans(OCFS2_SB(inode->i_sb), handle);
@@ -430,9 +427,7 @@ static int ocfs2_orphan_for_truncate(struct ocfs2_super *osb, 
	di->i_ctime = di->i_mtime = cpu_to_le64(inode->i_ctime.tv_sec);

	di->i_ctime_nsec = di->i_mtime_nsec = cpu_to_le32(inode->i_ctime.tv_nsec);



	status = ocfs2_journal_dirty(handle, fe_bh);

	if (status < 0)

		mlog_errno(status);

	ocfs2_journal_dirty(handle, fe_bh);



out_commit:

	ocfs2_commit_trans(osb, handle);
@@ -666,11 +661,7 @@ restarted_transaction: 
		goto leave;

	}



	status = ocfs2_journal_dirty(handle, bh);

	if (status < 0) {

		mlog_errno(status);

		goto leave;

	}

	ocfs2_journal_dirty(handle, bh);



	spin_lock(&OCFS2_I(inode)->ip_lock);

	clusters_to_add -= (OCFS2_I(inode)->ip_clusters - prev_clusters);
@@ -1194,9 +1185,7 @@ static int __ocfs2_write_remove_suid(struct inode *inode, 
	di = (struct ocfs2_dinode *) bh->b_data;

	di->i_mode = cpu_to_le16(inode->i_mode);



	ret = ocfs2_journal_dirty(handle, bh);

	if (ret < 0)

		mlog_errno(ret);

	ocfs2_journal_dirty(handle, bh);



out_trans:

	ocfs2_commit_trans(osb, handle);

fs/ocfs2/inode.c

+2 −12
Original line number Diff line number Diff line
@@ -657,12 +657,7 @@ static int ocfs2_remove_inode(struct inode *inode, 


	di->i_dtime = cpu_to_le64(CURRENT_TIME.tv_sec);

	di->i_flags &= cpu_to_le32(~(OCFS2_VALID_FL | OCFS2_ORPHANED_FL));



	status = ocfs2_journal_dirty(handle, di_bh);

	if (status < 0) {

		mlog_errno(status);

		goto bail_commit;

	}

	ocfs2_journal_dirty(handle, di_bh);



	ocfs2_remove_from_cache(INODE_CACHE(inode), di_bh);

	dquot_free_inode(inode);
@@ -1276,13 +1271,8 @@ int ocfs2_mark_inode_dirty(handle_t *handle, 
	fe->i_mtime = cpu_to_le64(inode->i_mtime.tv_sec);

	fe->i_mtime_nsec = cpu_to_le32(inode->i_mtime.tv_nsec);



	status = ocfs2_journal_dirty(handle, bh);

	if (status < 0)

		mlog_errno(status);



	status = 0;

	ocfs2_journal_dirty(handle, bh);

leave:



	mlog_exit(status);

	return status;

}

fs/ocfs2/journal.c

+3 −8
Original line number Diff line number Diff line
@@ -734,8 +734,7 @@ int ocfs2_journal_access(handle_t *handle, struct ocfs2_caching_info *ci, 
	return __ocfs2_journal_access(handle, ci, bh, NULL, type);

}



int ocfs2_journal_dirty(handle_t *handle,

			struct buffer_head *bh)

void ocfs2_journal_dirty(handle_t *handle, struct buffer_head *bh)

{

	int status;
@@ -743,13 +742,9 @@ int ocfs2_journal_dirty(handle_t *handle, 
		   (unsigned long long)bh->b_blocknr);



	status = jbd2_journal_dirty_metadata(handle, bh);

	if (status < 0)

		mlog(ML_ERROR, "Could not dirty metadata buffer. "

		     "(bh->b_blocknr=%llu)\n",

		     (unsigned long long)bh->b_blocknr);

	BUG_ON(status);



	mlog_exit(status);

	return status;

	mlog_exit_void();

}



#define OCFS2_DEFAULT_COMMIT_INTERVAL	(HZ * JBD2_DEFAULT_MAX_COMMIT_AGE)

CRA Git | Maintained and supported by SUSTech CRA and CCSE