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

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-07-01 19:22:15 -0500 (Thu, 01 Jul 2004)
New Revision: 1230

Modified:
   trunk/src/nm.c
Log:
* a couple cleanups of the whole if (inode) stuff in process_vote. We
  have an inode most of the time now so many of these are pointless.



Modified: trunk/src/nm.c
===================================================================
--- trunk/src/nm.c	2004-07-02 00:20:54 UTC (rev 1229)
+++ trunk/src/nm.c	2004-07-02 00:22:15 UTC (rev 1230)
@@ -844,12 +844,9 @@
 							   &needs_trunc, 1);
 			if (tmpstat < 0)
 				LOG_ERROR_STATUS (tmpstat);
-			if (needs_trunc) {
-				if (inode)
-					ocfs_truncate_inode_pages(inode, 0);
-				else
-					LOG_ERROR_STR("cannot truncate inode pages, inode NULL!");
-			}
+			if (needs_trunc)
+				ocfs_truncate_inode_pages(inode, 0);
+
 			vote_response = FLAG_VOTE_OIN_UPDATED;
 			break;
 
@@ -973,16 +970,15 @@
 
 			// if the requestor just wants to do readdir, we 
 			// drop our buffers, so switch to readonly and done
-			if (inode) {
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-				sync_mapping_buffers(inode->i_mapping);
+			sync_mapping_buffers(inode->i_mapping);
 #else
-				fsync_inode_buffers(inode);
+			fsync_inode_buffers(inode);
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,18)
-				fsync_inode_data_buffers(inode);
+			fsync_inode_data_buffers(inode);
 #endif
 #endif
-			}
+
 			ocfs_node_map_set_bit(&lockres->readonly_map, node_num);
 			lockres->readonly_node = osb->node_num;
 			vote_response = FLAG_VOTE_NODE;
@@ -1039,16 +1035,14 @@
 				lockres->readonly_node = OCFS_INVALID_NODE_NUM;
 			}
 
-			if (inode) {
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-				sync_mapping_buffers(inode->i_mapping);
+			sync_mapping_buffers(inode->i_mapping);
 #else
-				fsync_inode_buffers(inode);
+			fsync_inode_buffers(inode);
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,18)
-				fsync_inode_data_buffers(inode);
+			fsync_inode_data_buffers(inode);
 #endif
 #endif
-			}
 
 			/* nobody currently owns the lock so fastpath it */
 			if (vote_type == CHANGE_MASTER)
@@ -1069,7 +1063,7 @@
 			is_locked = DISK_LOCK(fe)->dl_level > OCFS_DLM_NO_LOCK;
 			if (vote_type == CHANGE_MASTER) {
 				fe = (ocfs2_dinode *) fe_bh->b_data;
-				if (inode && OCFS_I(inode)->ip_open_cnt) {
+				if (OCFS_I(inode)->ip_open_cnt) {
 					ocfs_node_map_init(osb, &disk_map);
 					ocfs_get_disk_lock_open_map(osb, DISK_LOCK(fe), &disk_map);
 					ocfs_node_map_set_bit(&disk_map, osb->node_num);
@@ -1263,10 +1257,8 @@
 			ocfs_inc_inode_seq(osb, inode, 1);
 		if (have_io_sem)
 			up_write(&OCFS_I(inode)->ip_io_sem);
-	}
-
-	if (inode)
 		iput(inode);
+	}
 	osb->voting_ino = 0;
 
 	up(&osb->vote_sem);