ocfs2: Make ocfs2_journal_dirty() void.
PATCH 1/1 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.
--- fs/ocfs2/alloc.c | 162 ++++++++++------------------------------------- fs/ocfs2/dir.c | 48 +++----------- fs/ocfs2/file.c | 19 +----- fs/ocfs2/inode.c | 14 +---- fs/ocfs2/journal.c | 11 +--- fs/ocfs2/journal.h | 3 +- fs/ocfs2/localalloc.c | 23 +------ fs/ocfs2/namei.c | 62 +++--------------- fs/ocfs2/quota_global.c | 4 +- fs/ocfs2/quota_local.c | 50 ++++----------- fs/ocfs2/refcounttree.c | 20 +----- fs/ocfs2/resize.c | 13 +--- fs/ocfs2/suballoc.c | 64 +++---------------- fs/ocfs2/xattr.c | 38 ++--------- 14 files changed, 101 insertions(+), 430 deletions(-)
fs/ocfs2/alloc.c +33 -129
@@ -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 ;
@@ -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, -path_leaf_bh (left_path)); -if (ret) -mlog_errno (ret); +ocfs2_journal_dirty (handle, +path_leaf_bh (left_path)); }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
109 lines not on this page · raw message
fs/ocfs2/file.c +4 -15
@@ -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
@@ -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
@@ -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)
fs/ocfs2/journal.h +1 -2
@@ -325,8 +325,7 @@ int ocfs2_journal_access(handle_t *handle, struct ocfs2_caching_info *ci,* <modify the bh> * ocfs2_journal_dirty(handle, bh); */ -int ocfs2_journal_dirty (handle_t *handle, -struct buffer_head *bh); +void ocfs2_journal_dirty (handle_t *handle,struct buffer_head *bh);/* * Credit Macros:
fs/ocfs2/localalloc.c +3 -20
@@ -305,12 +305,7 @@ void ocfs2_shutdown_local_alloc(struct ocfs2_super *osb) }ocfs2_clear_local_alloc (alloc); - - status =ocfs2_journal_dirty (handle, bh); -if (status <0 ) { -mlog_errno (status); - goto out_commit; - } +ocfs2_journal_dirty (handle, bh);brelse (bh); osb->local_alloc_bh =NULL ;
@@ -691,14 +686,8 @@ int ocfs2_claim_local_alloc_bits(struct ocfs2_super *osb,ocfs2_set_bit (start++, bitmap);le32_add_cpu (&alloc->id1.bitmap1.i_used, *num_bits); +ocfs2_journal_dirty (handle, osb->local_alloc_bh); - status =ocfs2_journal_dirty (handle, osb->local_alloc_bh); -if (status <0 ) { -mlog_errno (status); - goto bail; - } - - status =0 ; bail:mlog_exit (status);return status;
@@ -1167,12 +1156,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb, }ocfs2_clear_local_alloc (alloc); - - status =ocfs2_journal_dirty (handle, osb->local_alloc_bh); -if (status <0 ) { -mlog_errno (status); - goto bail; - } +ocfs2_journal_dirty (handle, osb->local_alloc_bh); status =ocfs2_sync_local_to_main (osb, handle, alloc_copy, main_bm_inode, main_bm_bh);
@@ -1190,7 +1174,6 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,atomic_inc (&osb->alloc_stats.moves); - status =0 ; bail:if (handle)ocfs2_commit_trans (osb, handle);
fs/ocfs2/namei.c +10 -52
122 lines not on this page · raw message
fs/ocfs2/quota_global.c +1 -3
@@ -260,10 +260,8 @@ ssize_t ocfs2_quota_write(struct super_block *sb, int type,brelse (bh); goto out; } - err =ocfs2_journal_dirty (handle, bh); +ocfs2_journal_dirty (handle, bh);brelse (bh); -if (err <0 ) - goto out; out:if (err) {mutex_unlock (&gqinode->i_mutex);
fs/ocfs2/quota_local.c +12 -38
98 lines not on this page · raw message
fs/ocfs2/refcounttree.c +4 -16
@@ -1269,9 +1269,7 @@ static int ocfs2_change_refcount_rec(handle_t *handle, }else if (merge)ocfs2_refcount_rec_merge (rb, index); - ret =ocfs2_journal_dirty (handle, ref_leaf_bh); -if (ret) -mlog_errno (ret); +ocfs2_journal_dirty (handle, ref_leaf_bh); out:return ret; }
@@ -1803,11 +1801,7 @@ static int ocfs2_insert_refcount_rec(handle_t *handle,if (merge)ocfs2_refcount_rec_merge (rb, index); - ret =ocfs2_journal_dirty (handle, ref_leaf_bh); -if (ret) { -mlog_errno (ret); - goto out; - } +ocfs2_journal_dirty (handle, ref_leaf_bh);if (index ==0 ) { ret = ocfs2_adjust_refcount_rec(handle, ci,
@@ -1978,9 +1972,7 @@ static int ocfs2_split_refcount_rec(handle_t *handle,ocfs2_refcount_rec_merge (rb, index); } - ret =ocfs2_journal_dirty (handle, ref_leaf_bh); -if (ret) -mlog_errno (ret); +ocfs2_journal_dirty (handle, ref_leaf_bh); out:brelse (new_bh);
@@ -3041,11 +3033,7 @@ static int ocfs2_duplicate_clusters_by_jbd(handle_t *handle, }memcpy (new_bh->b_data, old_bh->b_data, sb->s_blocksize); - ret =ocfs2_journal_dirty (handle, new_bh); -if (ret) { -mlog_errno (ret); -break ; - } +ocfs2_journal_dirty (handle, new_bh);brelse (new_bh);brelse (old_bh);
fs/ocfs2/resize.c +2 -11
@@ -134,11 +134,7 @@ static int ocfs2_update_last_group_and_inode(handle_t *handle,le16_add_cpu (&group->bg_free_bits_count,-1 * backups); } - ret =ocfs2_journal_dirty (handle, group_bh); -if (ret <0 ) { -mlog_errno (ret); - goto out_rollback; - } +ocfs2_journal_dirty (handle, group_bh);/* update the inode accordingly. */ ret = ocfs2_journal_access_di(handle, INODE_CACHE(bm_inode), bm_bh,
@@ -545,12 +541,7 @@ int ocfs2_group_add(struct inode *inode, struct ocfs2_new_group_input *input) group = (struct ocfs2_group_desc *)group_bh->b_data; group->bg_next_group = cr->c_blkno; - - ret =ocfs2_journal_dirty (handle, group_bh); -if (ret <0 ) { -mlog_errno (ret); - goto out_commit; - } +ocfs2_journal_dirty (handle, group_bh); ret =ocfs2_journal_access_di (handle,INODE_CACHE (main_bm_inode), main_bm_bh,OCFS2_JOURNAL_ACCESS_WRITE );
fs/ocfs2/suballoc.c +10 -54
128 lines not on this page · raw message
fs/ocfs2/xattr.c +7 -31
@@ -739,11 +739,7 @@ static int ocfs2_xattr_extend_allocation(struct inode *inode, goto leave; } - status =ocfs2_journal_dirty (handle, vb->vb_bh); -if (status <0 ) { -mlog_errno (status); - goto leave; - } +ocfs2_journal_dirty (handle, vb->vb_bh); clusters_to_add -=le32_to_cpu (vb->vb_xv->xr_clusters) - prev_clusters;
@@ -786,12 +782,7 @@ static int __ocfs2_remove_xattr_range(struct inode *inode, }le32_add_cpu (&vb->vb_xv->xr_clusters, -len); - - ret =ocfs2_journal_dirty (handle, vb->vb_bh); -if (ret) { -mlog_errno (ret); - goto out; - } +ocfs2_journal_dirty (handle, vb->vb_bh);if (ext_flags &OCFS2_EXT_REFCOUNTED ) ret = ocfs2_decrease_refcount(inode, handle,
@@ -1374,11 +1365,7 @@ static int __ocfs2_xattr_set_value_outside(struct inode *inode,memset (bh->b_data + cp_len,0 , blocksize - cp_len); - ret =ocfs2_journal_dirty (handle, bh); -if (ret <0 ) { -mlog_errno (ret); - goto out; - } +ocfs2_journal_dirty (handle, bh);brelse (bh); bh =NULL ;
@@ -2594,9 +2581,7 @@ int ocfs2_xattr_remove(struct inode *inode, struct buffer_head *di_bh) di->i_dyn_features =cpu_to_le16 (oi->ip_dyn_features);spin_unlock (&oi->ip_lock); - ret =ocfs2_journal_dirty (handle, di_bh); -if (ret <0 ) -mlog_errno (ret); +ocfs2_journal_dirty (handle, di_bh); out_commit:ocfs2_commit_trans (OCFS2_SB (inode->i_sb), handle); out:
@@ -2724,9 +2709,7 @@ static int ocfs2_xattr_ibody_init(struct inode *inode, di->i_dyn_features =cpu_to_le16 (oi->ip_dyn_features);spin_unlock (&oi->ip_lock); - ret =ocfs2_journal_dirty (ctxt->handle, di_bh); -if (ret <0 ) -mlog_errno (ret); +ocfs2_journal_dirty (ctxt->handle, di_bh); out:return ret;
@@ -5153,9 +5136,7 @@ static int ocfs2_add_new_xattr_cluster(struct inode *inode, goto leave; } - ret =ocfs2_journal_dirty (handle, root_bh); -if (ret <0 ) -mlog_errno (ret); +ocfs2_journal_dirty (handle, root_bh); leave:return ret;
@@ -5477,12 +5458,7 @@ static int ocfs2_rm_xattr_cluster(struct inode *inode, }le32_add_cpu (&xb->xb_attrs.xb_root.xt_clusters, -len); - - ret =ocfs2_journal_dirty (handle, root_bh); -if (ret) { -mlog_errno (ret); - goto out_commit; - } +ocfs2_journal_dirty (handle, root_bh); ret =ocfs2_truncate_log_append (osb, handle, blkno, len);if (ret)
Signature · 15 lines
1.7.0 -- "All alone at the end of the evening When the bright lights have faded to blue. I was thinking about a woman who had loved me And I never knew" Joel Becker Principal Software Developer Oracle E-mail: joel.becker at oracle.com Phone: (650) 506-8127
PATCH 1/1 ocfs2: Make ocfs2_journal_dirty() void.
Quoted 16 lines · Joel Becker
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'llBUG_ON()the status ofjbd2_journal_dirty_metadata()just in case they change it someday. They won't.Signed-off-by Joel Becker <[email protected]>
Quoted 16 lines
--- fs/ocfs2/alloc.c | 162 ++++++++++------------------------------------- fs/ocfs2/dir.c | 48 +++----------- fs/ocfs2/file.c | 19 +----- fs/ocfs2/inode.c | 14 +---- fs/ocfs2/journal.c | 11 +--- fs/ocfs2/journal.h | 3 +- fs/ocfs2/localalloc.c | 23 +------ fs/ocfs2/namei.c | 62 +++--------------- fs/ocfs2/quota_global.c | 4 +- fs/ocfs2/quota_local.c | 50 ++++----------- fs/ocfs2/refcounttree.c | 20 +----- fs/ocfs2/resize.c | 13 +--- fs/ocfs2/suballoc.c | 64 +++---------------- fs/ocfs2/xattr.c | 38 ++--------- 14 files changed, 101 insertions(+), 430 deletions(-)
Nice diffstat ;)
--A-Happy-Mark
--
Mark Fasheh