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

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-08-27 19:40:43 -0500 (Fri, 27 Aug 2004)
New Revision: 1397

Modified:
   trunk/src/nm.c
   trunk/src/ocfs.h
   trunk/src/vote.c
   trunk/src/vote.h
Log:
* remove the open_handle stuff from net voting. It hasn't been used in
  ages...



Modified: trunk/src/nm.c
===================================================================
--- trunk/src/nm.c	2004-08-28 00:06:52 UTC (rev 1396)
+++ trunk/src/nm.c	2004-08-28 00:40:43 UTC (rev 1397)
@@ -662,7 +662,6 @@
 	int vote_type = INVALID_REQUEST, vote_response = 0;
 	struct inode *inode = NULL;
 	int master_alive = 1;
-	int open_handle = 0;
 	int lockflags = 0;
 	int inc_inode_seq = 0;
 	int have_io_sem = 0;
@@ -942,7 +941,6 @@
 
 	/* Below here, we can't have any of these cases failing if
 	 * there was a successfull change master request. */
-	open_handle = 0;
 	switch (vote_type) {
 		case UPDATE_OIN_INODE:
 			LOG_TRACE_STR("UPDATE_OIN_INODE");
@@ -1076,10 +1074,6 @@
 		case REMASTER_REQUESTOR:
 			LOG_TRACE_STR("REMASTER_REQUESTOR");
 			vote_response = FLAG_VOTE_NODE;
-			if (inode && OCFS_I(inode)->ip_open_cnt 
-			    && flags & FLAG_FILE_EXTEND 
-			    && !(flags & FLAG_DIR))
-				open_handle = 1;
 			break;
 
 		case INVALID_REQUEST:
@@ -1117,10 +1111,10 @@
 	}
 
 vote:
-	status = ocfs_send_vote_reply(osb, dlm_msg, vote_response, open_handle);
+	status = ocfs_send_vote_reply(osb, dlm_msg, vote_response);
 
 #ifdef VERBOSE_PROCESS_VOTE
-	printk("(%u) vote: lockid=%llu, node=%d, seqnum=%llu, response=%d, open_handle=%s\n",current->pid, lock_id, node_num, seq_num, vote_response, open_handle?"yes":"no");
+	printk("(%u) vote: lockid=%llu, node=%d, seqnum=%llu, response=%d\n",current->pid, lock_id, node_num, seq_num, vote_response);
 #endif
 		       
 	if (status < 0)

Modified: trunk/src/ocfs.h
===================================================================
--- trunk/src/ocfs.h	2004-08-28 00:06:52 UTC (rev 1396)
+++ trunk/src/ocfs.h	2004-08-28 00:40:43 UTC (rev 1397)
@@ -677,8 +677,7 @@
 	__u64 lock_id;
 	__u64 lock_seq_num;
 	__u32 flags;
-	__u8 open_handle;
-	__u8 odmh_pad[3];
+	__u8 odmh_pad[4];
 	__u32 num_ident; /* number of identical messages, always >= 1 */
 } ocfs_dlm_msg_hdr;
 

Modified: trunk/src/vote.c
===================================================================
--- trunk/src/vote.c	2004-08-28 00:06:52 UTC (rev 1396)
+++ trunk/src/vote.c	2004-08-28 00:40:43 UTC (rev 1397)
@@ -303,7 +303,7 @@
  * ocfs_send_vote_reply()
  *
  */
-int ocfs_send_vote_reply (ocfs_super * osb, ocfs_dlm_msg * dlm_msg, __u32 vote_status, int inode_open)
+int ocfs_send_vote_reply (ocfs_super * osb, ocfs_dlm_msg * dlm_msg, __u32 vote_status)
 {
 	ocfs_dlm_req_master *req_master;
 	ocfs_dlm_reply_master *reply_master;
@@ -337,7 +337,6 @@
 	reply_master->h.lock_id = req_master->lock_id;
 	reply_master->status = vote_status;
 	reply_master->h.lock_seq_num = req_master->lock_seq_num;
-	reply_master->h.open_handle = inode_open;
 	reply_master->h.flags = req_master->flags;
 
 	ocfs_node_map_set_bit(&vote_map, dlm_msg->src_node);
@@ -445,7 +444,7 @@
 			reply = (ocfs_dlm_reply_master *) dlm_msg->msg_buf;
 			if (ocfs_node_map_stringify(&obj->req_vote_map, &reqstr) < 0)
 				break;
-			ret = snprintf(p, max, "REPLY: %d %c %3d %s %21llu %21llu %08x | %3d %c\n",
+			ret = snprintf(p, max, "REPLY: %d %c %3d %s %21llu %21llu %08x | %3d\n",
 				obj->pid,
 				vote_state_str[obj->vote_state],
 				obj->vote_status,
@@ -453,8 +452,7 @@
 				reply->h.lock_id,
 				reply->h.lock_seq_num,
 				reply->h.flags, 
-				reply->status,
-				reply->h.open_handle ? 'Y' : 'N');
+				reply->status);
 
 			break;
 		case OCFS_INFO_DISMOUNT:
@@ -763,7 +761,6 @@
 	req->lock_id = 0;
 	req->flags = 0;
 	req->lock_seq_num = 0;
-	req->open_handle = 0;
 
 	spin_lock(&osb->vote_obj_queue_lock);
 	list_add_tail(&obj->list, &osb->vote_obj_queue);
@@ -933,10 +930,8 @@
 {
 	int status;
 	int reply_status;
-	int open_handle = 0;
 
 	reply_status = ctxt->reply->status;
-	open_handle = ctxt->reply->h.open_handle;
 
 	status = 0;
 

Modified: trunk/src/vote.h
===================================================================
--- trunk/src/vote.h	2004-08-28 00:06:52 UTC (rev 1396)
+++ trunk/src/vote.h	2004-08-28 00:40:43 UTC (rev 1397)
@@ -48,7 +48,7 @@
 			       struct inode *inode, __u32 num_ident, 
 			       int *vote_status);
 int ocfs_send_vote_reply(ocfs_super *osb, ocfs_dlm_msg *dlm_msg,
-			 __u32 vote_status, int inode_open);
+			 __u32 vote_status);
 int ocfs_lookup_vote_request_obj (ocfs_super *osb, 
 				  ocfs_vote_obj_lookup_data *data);