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

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-09-09 21:04:49 -0500 (Thu, 09 Sep 2004)
New Revision: 1450

Modified:
   trunk/src/nm.c
Log:
* get rid of the whole io_sem_read_trylock junk and the
  verify_update_inode. These should happen elsewhere anyway.



Modified: trunk/src/nm.c
===================================================================
--- trunk/src/nm.c	2004-09-10 01:44:18 UTC (rev 1449)
+++ trunk/src/nm.c	2004-09-10 02:04:49 UTC (rev 1450)
@@ -386,43 +386,6 @@
 }
 
 
-static int ocfs_io_sem_read_trylock(struct inode *inode, u32 timeout)
-{
-	unsigned long jif;
-	int status;
-
-	OCFS_ASSERT(inode);
-
-	LOG_ENTRY_ARGS ("(%llu, %u)\n", OCFS_I(inode)->ip_blkno, timeout);
-
-	if (!timeout) {
-		down_read(&OCFS_I(inode)->ip_io_sem);
-		status = 0;
-		goto bail;
-	}
-
-	jif = jiffies + (timeout * HZ / 1000);
-
-	while(1) {
-		if (down_read_trylock(&OCFS_I(inode)->ip_io_sem)) {
-			status = 0;
-			break;
-		}
-
-		if (jif < jiffies) {
-			status = -ETIMEDOUT;
-			break;
-		}
-
-		ocfs_sleep (OCFS_NM_HEARTBEAT_TIME / 10);
-	}
-
-bail:
-	LOG_EXIT_STATUS (status);
-	return status;
-}
-
-
 static int ocfs_process_inode_delete(struct inode *inode)
 {
 	int status;
@@ -699,24 +662,9 @@
 	if (!inode)
 		goto no_inode_leave;
 
-	if (have_io_sem) {
+	if (have_io_sem)
 		up_write(&OCFS_I(inode)->ip_io_sem);
-		have_io_sem = 0;
-	}
 
-	if (atomic_read(&OCFS_I(inode)->ip_needs_verification) 
-	    && vote_type == UPDATE_OIN_INODE) {
-		if (ocfs_io_sem_read_trylock(inode, (OCFS_NM_HEARTBEAT_TIME/2))) {
-			LOG_ERROR_ARGS("Could not verify_update on %llu\n",
-				       OCFS_I(inode)->ip_blkno);
-		} else {
-			tmpstat = ocfs_verify_update_inode(osb, inode);
-			if (tmpstat < 0)
-				LOG_ERROR_STATUS(tmpstat);
-			up_read(&OCFS_I(inode)->ip_io_sem);
-		}
-	}
-
 	if (inc_inode_seq) {
 		ocfs_inc_inode_seq(osb, inode);
 		sync_mapping_buffers(inode->i_mapping);