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

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-07-16 19:59:11 -0500 (Fri, 16 Jul 2004)
New Revision: 1282

Modified:
   trunk/src/buffer_head_io.c
   trunk/src/dlm.c
   trunk/src/lockres.c
Log:
* don't force a sync read in the system file case anymore.



Modified: trunk/src/buffer_head_io.c
===================================================================
--- trunk/src/buffer_head_io.c	2004-07-17 00:58:29 UTC (rev 1281)
+++ trunk/src/buffer_head_io.c	2004-07-17 00:59:11 UTC (rev 1282)
@@ -217,13 +217,6 @@
 	    !(OCFS_I(inode)->ip_flags & OCFS_INODE_SYSTEM_FILE))
 		flags |= OCFS_BH_CACHED;
 
-	if (inode && (flags & OCFS_BH_CACHED) &&
-	    (OCFS_I(inode)->ip_flags & OCFS_INODE_SYSTEM_FILE)) {
-		LOG_TRACE_STR("hey bozo you are trying to read "
-			      "a system thingy cached!");
-		flags &= ~OCFS_BH_CACHED;
-	}
-
 	sb = osb->sb;
 	blocknum = off >> sb->s_blocksize_bits;
 

Modified: trunk/src/dlm.c
===================================================================
--- trunk/src/dlm.c	2004-07-17 00:58:29 UTC (rev 1281)
+++ trunk/src/dlm.c	2004-07-17 00:59:11 UTC (rev 1282)
@@ -639,7 +639,6 @@
 		if (handle) {
 			status = ocfs_journal_dirty(handle, *bh);
 			lockres->lock_holders++;
-#warning I hope these lock flags are alright.
 			ocfs_handle_add_lock(handle, lockres->lock_type, 0, 
 					     *bh, inode, 0);
 		} else
@@ -1038,9 +1037,6 @@
 	ocfs2_dinode *fe = NULL;
 	struct buffer_head *tmpbh = NULL, **b = NULL;
 	__s16 curr_master;
-	int lockflags =
-		(OCFS_I(inode)->ip_flags & OCFS_INODE_SYSTEM_FILE) ?
-		0 : OCFS_BH_CACHED;
 	int clear_tmp = 0;
 	ocfs_lock_res *lockres = GET_INODE_LOCKRES(inode);
 
@@ -1067,7 +1063,7 @@
 	}
 
 	if (bh == NULL) {	
-		status = ocfs_read_bh (osb, lock_id, b, lockflags, inode);
+		status = ocfs_read_bh (osb, lock_id, b, OCFS_BH_CACHED, inode);
 		if (status < 0) {
 			LOG_ERROR_STATUS (status);
 			goto finito;

Modified: trunk/src/lockres.c
===================================================================
--- trunk/src/lockres.c	2004-07-17 00:58:29 UTC (rev 1281)
+++ trunk/src/lockres.c	2004-07-17 00:59:11 UTC (rev 1282)
@@ -77,9 +77,8 @@
 	b = (bh == NULL) ? &tmpbh : bh;
 
 	if (reread) {
-		flags = (inode && OCFS_I(inode)->ip_flags & OCFS_INODE_SYSTEM_FILE) ?
-			0 : lockres->master_node_num == osb->node_num ? 
-		    	OCFS_BH_CACHED : 0;	
+		flags = lockres->master_node_num == osb->node_num ? 
+		    	OCFS_BH_CACHED : 0;
 		status = ocfs_read_bh(osb,
 				      OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits,
 				      b, flags, inode);