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: Joel Becker <joel.becker@oracle.com>
This commit is contained in:
@ -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;
|
||||
@ -1169,12 +1158,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);
|
||||
@ -1192,7 +1176,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);
|
||||
|
Reference in New Issue
Block a user