aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/journal.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ocfs2/journal.c')
-rw-r--r--fs/ocfs2/journal.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
index 9336c60e3a3..cfd271c64da 100644
--- a/fs/ocfs2/journal.c
+++ b/fs/ocfs2/journal.c
@@ -734,8 +734,7 @@ int ocfs2_journal_access(handle_t *handle, struct ocfs2_caching_info *ci,
734 return __ocfs2_journal_access(handle, ci, bh, NULL, type); 734 return __ocfs2_journal_access(handle, ci, bh, NULL, type);
735} 735}
736 736
737int ocfs2_journal_dirty(handle_t *handle, 737void ocfs2_journal_dirty(handle_t *handle, struct buffer_head *bh)
738 struct buffer_head *bh)
739{ 738{
740 int status; 739 int status;
741 740
@@ -743,13 +742,9 @@ int ocfs2_journal_dirty(handle_t *handle,
743 (unsigned long long)bh->b_blocknr); 742 (unsigned long long)bh->b_blocknr);
744 743
745 status = jbd2_journal_dirty_metadata(handle, bh); 744 status = jbd2_journal_dirty_metadata(handle, bh);
746 if (status < 0) 745 BUG_ON(status);
747 mlog(ML_ERROR, "Could not dirty metadata buffer. "
748 "(bh->b_blocknr=%llu)\n",
749 (unsigned long long)bh->b_blocknr);
750 746
751 mlog_exit(status); 747 mlog_exit_void();
752 return status;
753} 748}
754 749
755#define OCFS2_DEFAULT_COMMIT_INTERVAL (HZ * JBD2_DEFAULT_MAX_COMMIT_AGE) 750#define OCFS2_DEFAULT_COMMIT_INTERVAL (HZ * JBD2_DEFAULT_MAX_COMMIT_AGE)