[Ocfs2-commits] rev 752 - trunk/src

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-03-03 17:33:37 -0600 (Wed, 03 Mar 2004)
New Revision: 752

Modified:
   trunk/src/osb.c
Log:
Catch any error from ocfs_journal_wipe in ocfs_check_volume instead of blindly continuing.


Modified: trunk/src/osb.c
===================================================================
--- trunk/src/osb.c	2004-03-02 23:07:01 UTC (rev 751)
+++ trunk/src/osb.c	2004-03-03 23:33:37 UTC (rev 752)
@@ -415,11 +415,16 @@
 	/* If the journal was unmounted cleanly then we don't want to
 	 * recover anything. Otherwise, journal_load will do that
 	 * dirty work for us :) */
-	if (!mounted)
-		ocfs_journal_wipe(&osb->journal, 0);
-	else
+	if (!mounted) {		
+		status = ocfs_journal_wipe(&osb->journal, 0);
+		if (status < 0) {
+			LOG_ERROR_STATUS(status);
+			goto finally;
+		}
+	} else {
 		printk(KERN_NOTICE "ocfs2: File system was not unmounted "
 		       "cleanly, recovering volume.\n");
+	}
 
 	/* will play back anything left in the journal. */
 	ocfs_journal_load(&osb->journal);