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

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-03-15 15:48:08 -0600 (Mon, 15 Mar 2004)
New Revision: 777

Modified:
   trunk/src/dir.c
Log:
* get rid of the whole dir_cache_lock sillyness in
  ocfs_insert_file. It does nothing, and may even lead to bugs later on.



Modified: trunk/src/dir.c
===================================================================
--- trunk/src/dir.c	2004-03-13 02:13:26 UTC (rev 776)
+++ trunk/src/dir.c	2004-03-15 21:48:08 UTC (rev 777)
@@ -1041,7 +1041,7 @@
 	ocfs_dir_node *DirNode = NULL;
 	ocfs_dir_node *LockNode = NULL;
 	__u64 dir_off;
-	bool parent_is_lock_node, dir_cache_lock;
+	bool parent_is_lock_node;
 	struct buffer_head **bhs = NULL;
 	const int numbhs = 256;
 	const int length = numbhs * sizeof(struct buffer_head *);
@@ -1119,8 +1119,6 @@
 	DirNode = (ocfs_dir_node *)OCFS_BH_GET_DATA_READ(bhs[0]); /* read */
 	dir_num_ent_used = DirNode->num_ent_used;
 	dir_next_node = DirNode->next_node_ptr;
-	dir_cache_lock = ((DISK_LOCK_FILE_LOCK(DirNode) == OCFS_DLM_ENABLE_CACHE_LOCK) && 
-			    (DISK_LOCK_CURRENT_MASTER(DirNode) == osb->node_num));
 	OCFS_BH_PUT_DATA(bhs[0]);
 	DirNode = NULL;
 
@@ -1177,8 +1175,6 @@
 	DirNode = (ocfs_dir_node *)OCFS_BH_GET_DATA_READ(bhs[0]); /* read */
 	dir_num_ent_used = DirNode->num_ent_used;
 	dir_next_node = DirNode->next_node_ptr;
-	dir_cache_lock = ((DISK_LOCK_FILE_LOCK(DirNode) == OCFS_DLM_ENABLE_CACHE_LOCK) && 
-			    (DISK_LOCK_CURRENT_MASTER(DirNode) == osb->node_num));
 	parent_is_lock_node = (DirNode->node_disk_off == locknode_off);
 	OCFS_BH_PUT_DATA(bhs[0]);
 	DirNode = NULL;
@@ -1298,10 +1294,6 @@
 
 		pNewDirNode = (ocfs_dir_node *)OCFS_BH_GET_DATA_WRITE(newbhs[0]); /* write */
 		new_disk_off = pNewDirNode->node_disk_off;
-		if (dir_cache_lock) {
-			DISK_LOCK_CURRENT_MASTER (pNewDirNode) = osb->node_num;
-			DISK_LOCK_FILE_LOCK (pNewDirNode) = OCFS_DLM_ENABLE_CACHE_LOCK;
-		}
 		OCFS_BH_PUT_DATA(newbhs[0]);
 		pNewDirNode = NULL;