[Ocfs2-commits] mfasheh commits r851 - trunk/src

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-04-19 12:56:04 -0500 (Mon, 19 Apr 2004)
New Revision: 851

Modified:
   trunk/src/journal.c
Log:
* include a patch by Sonic Zhang <sonic.zhang at intel.com> to work
around a bug in 2.6.x journal_update_superblock().



Modified: trunk/src/journal.c
===================================================================
--- trunk/src/journal.c	2004-04-17 02:29:29 UTC (rev 850)
+++ trunk/src/journal.c	2004-04-19 17:56:04 UTC (rev 851)
@@ -1091,6 +1091,9 @@
 	int status = 0;
 	ocfs_super * osb = NULL;
 	struct super_block *sb = NULL;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+	struct buffer_head *bh;
+#endif
 
 	LOG_ENTRY();
 
@@ -1122,6 +1125,13 @@
 		goto done;
 	}
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+	/* work around a bug in journal_update_superblock() */
+	bh = journal->k_journal->j_sb_buffer;
+	mark_buffer_dirty(bh);
+	sync_dirty_buffer(bh);
+#endif
+
 	journal->state = OCFS_JOURNAL_LOADED;
 	journal->bmaps = 0;