[Ocfs2-commits] jlbec commits r1158 - trunk/src

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2004-06-21 14:24:57 -0500 (Mon, 21 Jun 2004)
New Revision: 1158

Modified:
   trunk/src/buffer_head_io.c
   trunk/src/dlm.c
   trunk/src/nm.c
   trunk/src/ocfs.h
Log:

o Remove IS_SYSTEM_FILE_INODE() and make the flag check explicit.
o Fix ocfs_read_bhs() for NULL inodes.



Modified: trunk/src/buffer_head_io.c
===================================================================
--- trunk/src/buffer_head_io.c	2004-06-21 16:42:08 UTC (rev 1157)
+++ trunk/src/buffer_head_io.c	2004-06-21 19:24:57 UTC (rev 1158)
@@ -213,10 +213,12 @@
 		goto bail;
 	}
 
-	if ((flags & OCFS_BH_COND_CACHED) && !IS_SYSTEM_FILE_INODE(inode))
+	if (inode && (flags & OCFS_BH_COND_CACHED) &&
+	    !(OCFS_I(inode)->ip_flags & OCFS_INODE_SYSTEM_FILE))
 		flags |= OCFS_BH_CACHED;
 
-	if ((flags & OCFS_BH_CACHED) && IS_SYSTEM_FILE_INODE(inode)) {
+	if (inode && (flags & OCFS_BH_CACHED) &&
+	    (OCFS_I(inode)->ip_flags & OCFS_INODE_SYSTEM_FILE)) {
 		LOG_TRACE_STR("hey bozo you are trying to write "
 			      "a system thingy cached!");
 		flags &= ~OCFS_BH_CACHED;

Modified: trunk/src/dlm.c
===================================================================
--- trunk/src/dlm.c	2004-06-21 16:42:08 UTC (rev 1157)
+++ trunk/src/dlm.c	2004-06-21 19:24:57 UTC (rev 1158)
@@ -991,7 +991,9 @@
 	ocfs2_dinode *fe = NULL;
 	struct buffer_head *tmpbh = NULL, **b = NULL;
 	__u32 curr_master;
-	int lockflags = (IS_SYSTEM_FILE_INODE(inode) ? 0 : OCFS_BH_CACHED);
+	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);
 

Modified: trunk/src/nm.c
===================================================================
--- trunk/src/nm.c	2004-06-21 16:42:08 UTC (rev 1157)
+++ trunk/src/nm.c	2004-06-21 19:24:57 UTC (rev 1158)
@@ -796,7 +796,8 @@
 		}
 	}
 
-	lockflags = (IS_SYSTEM_FILE_INODE(inode) ? 0 : OCFS_BH_CACHED);
+	lockflags = (OCFS_I(inode)->ip_flags & OCFS_INODE_SYSTEM_FILE)
+	       	? 0 : OCFS_BH_CACHED;
 
 	/* fail here if no inode, unless this is a delete/rename release */
 	vote_type = get_process_vote_action(osb, lockres, node_num, flags, 

Modified: trunk/src/ocfs.h
===================================================================
--- trunk/src/ocfs.h	2004-06-21 16:42:08 UTC (rev 1157)
+++ trunk/src/ocfs.h	2004-06-21 19:24:57 UTC (rev 1158)
@@ -475,9 +475,6 @@
 
 #define GET_INODE_CLEAN_SEQ(i)  (atomic_t *)(&(OCFS_I(i)->ip_clean_buffer_seq))
 
-#define IS_SYSTEM_FILE_INODE(i)  (OCFS_I(i)->ip_flags & OCFS_INODE_SYSTEM_FILE)
-
-
 #define INODE_DELETED(i) (OCFS_I(i)->ip_flags & OCFS_INODE_DELETED)
 #define SET_INODE_DELETED(i) (OCFS_I(i)->ip_flags |= OCFS_INODE_DELETED)
 #define CLEAR_INODE_DELETED(i) (OCFS_I(i)->ip_flags &= (~OCFS_INODE_DELETED))