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

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-09-03 18:46:36 -0500 (Fri, 03 Sep 2004)
New Revision: 1426

Modified:
   trunk/src/buffer_head_io.c
   trunk/src/buffer_head_io.h
   trunk/src/volcfg.c
Log:
* get rid of unused / useless buffer i/o flags.



Modified: trunk/src/buffer_head_io.c
===================================================================
--- trunk/src/buffer_head_io.c	2004-09-03 23:46:04 UTC (rev 1425)
+++ trunk/src/buffer_head_io.c	2004-09-03 23:46:36 UTC (rev 1426)
@@ -121,11 +121,7 @@
 			goto bail;
 		}
 
-		if (flags & OCFS_BH_CONCURRENT_WRITE)
-			goto skip_modified_check;
-
-skip_modified_check:
-		if (!(flags & OCFS_BH_IGNORE_JBD) && buffer_jbd(bh)) {
+		if (buffer_jbd(bh)) {
 #ifdef VERBOSE_BH_JBD_TRACE
 			LOG_TRACE_ARGS("trying to write a jbd managed bh "
 				       "(blocknr = %llu), nr=%d\n", 
@@ -135,7 +131,7 @@
 		}
 
 		lock_buffer(bh);
-		if (!(flags & OCFS_BH_IGNORE_JBD) && buffer_jbd(bh)) {
+		if (buffer_jbd(bh)) {
 #ifdef CATCH_BH_JBD_RACES
 			printk("Ugh, block %llu had the JBD bit set "
 			       "while I was in lock_buffer!", 

Modified: trunk/src/buffer_head_io.h
===================================================================
--- trunk/src/buffer_head_io.h	2004-09-03 23:46:04 UTC (rev 1425)
+++ trunk/src/buffer_head_io.h	2004-09-03 23:46:36 UTC (rev 1426)
@@ -63,8 +63,6 @@
 
 
 #define OCFS_BH_CACHED            1
-#define OCFS_BH_CONCURRENT_WRITE  2     /* This should only be used by ocfs_worker */
-#define OCFS_BH_IGNORE_JBD        4     /* This should only be used by ocfs_checkpoint_handle! */
 #define OCFS_BH_READAHEAD         8	/* use this to pass READA down to submit_bh */
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)

Modified: trunk/src/volcfg.c
===================================================================
--- trunk/src/volcfg.c	2004-09-03 23:46:04 UTC (rev 1425)
+++ trunk/src/volcfg.c	2004-09-03 23:46:36 UTC (rev 1426)
@@ -84,9 +84,7 @@
 	offset = cfg_task->lock_off;
 
 	/* Write the sector back */
-	/* NOTE: another thread owns this bh!           */
-	/* we *must* pass OCFS_BH_CONCURRENT_WRITE here */
-	status = ocfs_write_bh(osb, bh, OCFS_BH_CONCURRENT_WRITE, NULL);
+	status = ocfs_write_bh(osb, bh, 0, NULL);
 	if (status < 0) {
 		LOG_ERROR_STATUS (status);
 		/* deliberate no exit jump here */