aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jbd2/checkpoint.c
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2010-10-27 21:30:04 -0400
committerTheodore Ts'o <tytso@mit.edu>2010-10-27 21:30:04 -0400
commit5c2178e785244341d1e6f2bc3b62f20a337cc44f (patch)
tree669b8108fbe2708dff06dce25be6d70f68c553c4 /fs/jbd2/checkpoint.c
parenta1c6c5698d53db4c47a25c3a8d11731a4d7b8370 (diff)
downloadmrst-s0i3-test-5c2178e785244341d1e6f2bc3b62f20a337cc44f.tar.gz
mrst-s0i3-test-5c2178e785244341d1e6f2bc3b62f20a337cc44f.tar.xz
mrst-s0i3-test-5c2178e785244341d1e6f2bc3b62f20a337cc44f.zip
jbd2: Add sanity check for attempts to start handle during umount
An attempt to modify the file system during the call to jbd2_destroy_journal() can lead to a system lockup. So add some checking to make it much more obvious when this happens to and to determine where the offending code is located. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/jbd2/checkpoint.c')
-rw-r--r--fs/jbd2/checkpoint.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c
index 5247e7ffdcb..524800dce20 100644
--- a/fs/jbd2/checkpoint.c
+++ b/fs/jbd2/checkpoint.c
@@ -299,6 +299,16 @@ static int __process_buffer(journal_t *journal, struct journal_head *jh,
transaction->t_chp_stats.cs_forced_to_close++;
spin_unlock(&journal->j_list_lock);
jbd_unlock_bh_state(bh);
+ if (unlikely(journal->j_flags & JBD2_UNMOUNT))
+ /*
+ * The journal thread is dead; so starting and
+ * waiting for a commit to finish will cause
+ * us to wait for a _very_ long time.
+ */
+ printk(KERN_ERR "JBD2: %s: "
+ "Waiting for Godot: block %llu\n",
+ journal->j_devname,
+ (unsigned long long) bh->b_blocknr);
jbd2_log_start_commit(journal, tid);
jbd2_log_wait_commit(journal, tid);
ret = 1;