[Ocfs2-commits] wcoekaer commits r1370 - trunk/src

[svn-commits at oss.oracle.com]

Author: wcoekaer
Date: 2004-08-20 17:23:01 -0500 (Fri, 20 Aug 2004)
New Revision: 1370

Modified:
   trunk/src/nm.c
Log:
fix for 2.6 null pointer based on previous commit



Modified: trunk/src/nm.c
===================================================================
--- trunk/src/nm.c	2004-08-20 21:57:25 UTC (rev 1369)
+++ trunk/src/nm.c	2004-08-20 22:23:01 UTC (rev 1370)
@@ -988,6 +988,22 @@
 			else 
 				vote_response = FLAG_VOTE_NODE;
 			break;
+		case TRUNCATE_PAGES:
+			LOG_TRACE_STR("TRUNCATE_PAGES");
+			if(inode) {
+				status = ocfs_sync_inode(inode);
+				if (status < 0) {
+					LOG_ERROR_STATUS(status);
+					vote_response = FLAG_VOTE_UPDATE_RETRY;
+					goto vote;
+				}
+
+				ocfs_truncate_inode_pages(inode, 0);
+				ocfs_extent_map_destroy(&OCFS_I(inode)->ip_ext_map);
+				ocfs_extent_map_init(&OCFS_I(inode)->ip_ext_map);
+			}
+			vote_response = FLAG_VOTE_NODE;
+			goto vote;
 		case INVALID_REQUEST:
 			/* we catch INVALID_REQUEST up here now as we
 			 * don't want to do a change_master on a
@@ -1003,7 +1019,7 @@
 		goto vote;
 	}
 
-	if ((lockres->master_node_num == osb->node_num)
+	if (lockres && (lockres->master_node_num == osb->node_num)
 	    && (flags & FLAG_CHANGE_MASTER)) {
 		LOG_TRACE_STR("CHANGE_MASTER");
 
@@ -1243,23 +1259,6 @@
 				open_handle = 1;
 			break;
 
-		case TRUNCATE_PAGES:
-			LOG_TRACE_STR("TRUNCATE_PAGES");
-			if(inode) {
-				status = ocfs_sync_inode(inode);
-				if (status < 0) {
-					LOG_ERROR_STATUS(status);
-					vote_response = FLAG_VOTE_UPDATE_RETRY;
-					break;
-				}
-
-				ocfs_truncate_inode_pages(inode, 0);
-				ocfs_extent_map_destroy(&OCFS_I(inode)->ip_ext_map);
-				ocfs_extent_map_init(&OCFS_I(inode)->ip_ext_map);
-			}
-			vote_response = FLAG_VOTE_NODE;
-			break;
-
 		case INVALID_REQUEST:
 		default:
 			LOG_TRACE_STR("INVALID_REQUEST");