patch-2.4.25 linux-2.4.25/fs/jfs/jfs_logmgr.c

• Lines: 21
• Date: 2004-02-18 05:36:31.000000000 -0800
• Orig file: linux-2.4.24/fs/jfs/jfs_logmgr.c
• Orig date: 2003-11-28 10:26:21.000000000 -0800

diff -urN linux-2.4.24/fs/jfs/jfs_logmgr.c linux-2.4.25/fs/jfs/jfs_logmgr.c
@@ -1409,6 +1409,10 @@
 	int i;
 	struct tblock *target;
 
+	if (!log)
+		/* jfs_write_inode may call us during read-only mount */
+		return;
+
 	jfs_info("jfs_flush_journal: log:0x%p wait=%d", log, wait);
 
 	LOGGC_LOCK(log);
@@ -2211,8 +2215,7 @@
 	} while (!jfs_stop_threads);
 
 	jfs_info("jfsIOWait being killed!");
-	complete(&jfsIOwait);
-	return 0;
+	complete_and_exit(&jfsIOwait, 0);
 }
 
 /*