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

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-08-30 20:50:11 -0500 (Mon, 30 Aug 2004)
New Revision: 1406

Modified:
   trunk/src/nm.c
Log:
* fall through when get_process_vote_action says TRUNCATE_PAGES as it
  may not actually be the only request (for example, we'll get this on
  an real truncate when we might have to do the master change
  processing).

* In a truncate_pages request, handle the UPDATE_OIN stuff too.



Modified: trunk/src/nm.c
===================================================================
--- trunk/src/nm.c	2004-08-31 00:10:20 UTC (rev 1405)
+++ trunk/src/nm.c	2004-08-31 01:50:11 UTC (rev 1406)
@@ -822,10 +822,13 @@
 				down(&OCFS_I(inode)->ip_sem);
 				ocfs_extent_map_destroy(&OCFS_I(inode)->ip_ext_map);
 				ocfs_extent_map_init(&OCFS_I(inode)->ip_ext_map);
+				/* truncate may send this */
+				if (flags & FLAG_FILE_UPDATE_OIN)
+					atomic_set(&OCFS_I(inode)->ip_needs_verification, 1);
 				up(&OCFS_I(inode)->ip_sem);
 			}
 			vote_response = FLAG_VOTE_NODE;
-			goto vote;
+			break;
 		case INVALID_REQUEST:
 			/* we catch INVALID_REQUEST up here now as we
 			 * don't want to do a change_master on a
@@ -1022,10 +1025,6 @@
 			status = 0;
 			break;
 
-		case CHANGE_MASTER:
-			/* we dealt with this all above. */
-			break;
-
 		case DROP_READONLY:
 			/* TODO: may need locking in here to lock out 
 			 * the actual IO that a readdir may have in 
@@ -1076,6 +1075,11 @@
 			vote_response = FLAG_VOTE_NODE;
 			break;
 
+		case TRUNCATE_PAGES:
+		case CHANGE_MASTER:
+			/* we dealt with this all above. */
+			break;
+
 		case INVALID_REQUEST:
 		default:
 			LOG_TRACE_STR("INVALID_REQUEST");