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

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-08-03 19:57:15 -0500 (Tue, 03 Aug 2004)
New Revision: 1327

Modified:
   trunk/src/journal.c
Log:
* get rid of the data_flush stuff in commit_cache as it was unused and
  we probably don't ever want to be doing sync_dev either.



Modified: trunk/src/journal.c
===================================================================
--- trunk/src/journal.c	2004-08-04 00:53:13 UTC (rev 1326)
+++ trunk/src/journal.c	2004-08-04 00:57:15 UTC (rev 1327)
@@ -61,7 +61,7 @@
 				   struct inode *inode);
 static int ocfs_recover_node(struct _ocfs_super *osb, int node_num);
 static int __ocfs_recovery_thread(void *arg);
-static int ocfs_commit_cache (ocfs_super * osb, int data_flush);
+static int ocfs_commit_cache (ocfs_super * osb);
 static int ocfs_wait_on_mount(ocfs_super *osb);
 static int ocfs_journal_flush(ocfs_journal *journal);
 static void ocfs_handle_move_locks(ocfs_journal *journal, 
@@ -167,7 +167,7 @@
  * This is in journal.c for lack of a better place.
  *
  */
-static int ocfs_commit_cache(ocfs_super *osb, int data_flush)
+static int ocfs_commit_cache(ocfs_super *osb)
 {
 	int status = 0, tmpstat;
 	ocfs_journal * journal = NULL;
@@ -177,7 +177,7 @@
 	ocfs_inode_private *ip;
 	ocfs_lock_res *lockres;
 
-	LOG_ENTRY_ARGS("(data_flush = %u)\n", data_flush);
+	LOG_ENTRY();
 
 	journal = osb->journal;
 
@@ -187,7 +187,7 @@
 	if (atomic_read(&journal->num_trans) == 0) {
 		up_write(&journal->trans_barrier);
 		LOG_TRACE_STR("No transactions for me to flush!");
-		goto flush_data;
+		goto finally;
 	}
 
 	journal_lock_updates(journal->k_journal);
@@ -297,11 +297,6 @@
 		kmem_cache_free(OcfsGlobalCtxt.lock_cache, lock);
 	}
 
-flush_data:
-	/* flush data buffers if asked. */
-	if (data_flush)
-		ocfs_sync_blockdev(osb->sb);
-
 finally:
 	LOG_EXIT_STATUS (status);
 	return status;
@@ -370,12 +365,12 @@
 	return ret;
 }
 
-static inline int ocfs_commit_cache24 (ocfs_super * osb, int data_flush)
+static inline int ocfs_commit_cache24 (ocfs_super * osb)
 {
 	int ret;
 
 	lock_kernel();
-	ret = ocfs_commit_cache(osb, data_flush);
+	ret = ocfs_commit_cache(osb);
 	unlock_kernel();
 	return ret;
 }
@@ -1927,7 +1922,7 @@
 		    (osb->osb_flags & OCFS_OSB_FLAGS_BEING_DISMOUNTED))
 			finish = 1;
 
-		status = ocfs_commit_cache(osb, 0);
+		status = ocfs_commit_cache(osb);
 		if (status < 0)
 			LOG_ERROR_STATUS(status);