File tree Expand file tree Collapse file tree 1 file changed +4
-3
lines changed Expand file tree Collapse file tree 1 file changed +4
-3
lines changed Original file line number Diff line number Diff line change @@ -1055,7 +1055,7 @@ void ocfs2_journal_shutdown(struct ocfs2_super *osb)
1055
1055
if (!igrab (inode ))
1056
1056
BUG ();
1057
1057
1058
- num_running_trans = atomic_read (& (osb -> journal -> j_num_trans ));
1058
+ num_running_trans = atomic_read (& (journal -> j_num_trans ));
1059
1059
trace_ocfs2_journal_shutdown (num_running_trans );
1060
1060
1061
1061
/* Do a commit_cache here. It will flush our journal, *and*
@@ -1074,9 +1074,10 @@ void ocfs2_journal_shutdown(struct ocfs2_super *osb)
1074
1074
osb -> commit_task = NULL ;
1075
1075
}
1076
1076
1077
- BUG_ON (atomic_read (& (osb -> journal -> j_num_trans )) != 0 );
1077
+ BUG_ON (atomic_read (& (journal -> j_num_trans )) != 0 );
1078
1078
1079
- if (ocfs2_mount_local (osb )) {
1079
+ if (ocfs2_mount_local (osb ) &&
1080
+ (journal -> j_journal -> j_flags & JBD2_LOADED )) {
1080
1081
jbd2_journal_lock_updates (journal -> j_journal );
1081
1082
status = jbd2_journal_flush (journal -> j_journal , 0 );
1082
1083
jbd2_journal_unlock_updates (journal -> j_journal );
You can’t perform that action at this time.
0 commit comments