[Ocfs2-commits] mfasheh commits r1666 - branches/dlm-glue/src

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-11-23 12:36:58 -0600 (Tue, 23 Nov 2004)
New Revision: 1666

Modified:
   branches/dlm-glue/src/vote.c
Log:
* move the mounted_map check inside of the super block lock, where it is actually valid.

* assert on only the correct enum values in ocfs2_request_vote.



Modified: branches/dlm-glue/src/vote.c
===================================================================
--- branches/dlm-glue/src/vote.c	2004-11-23 04:01:37 UTC (rev 1665)
+++ branches/dlm-glue/src/vote.c	2004-11-23 18:36:58 UTC (rev 1666)
@@ -569,8 +569,7 @@
 
 	OCFS_ASSERT(type == OCFS2_VOTE_REQ_DELETE ||
 		    type == OCFS2_VOTE_REQ_UNLINK ||
-		    type == OCFS2_VOTE_REQ_RENAME ||
-		    type == OCFS2_VOTE_REQ_UMOUNT);
+		    type == OCFS2_VOTE_REQ_RENAME);
 
 	request = kmalloc(sizeof(*request), GFP_KERNEL);
 	if (!request) {
@@ -617,10 +616,6 @@
 		if (signal_pending(current))
 			return -EINTR;
 
-		if (ocfs_node_map_is_only(osb, &osb->mounted_map,
-					  osb->node_num))
-			return 0;
-
 		status = ocfs2_super_lock(osb, 0);
 		if (status < 0) {
 			if (status != -EINTR)
@@ -628,8 +623,13 @@
 			break;
 		}
 
-		status = ocfs2_do_request_vote(osb, OCFS_I(inode)->ip_blkno,
-					       inode->i_generation, type);
+		status = 0;
+		if (!ocfs_node_map_is_only(osb, &osb->mounted_map,
+					   osb->node_num))
+			status = ocfs2_do_request_vote(osb, 
+						       OCFS_I(inode)->ip_blkno,
+						       inode->i_generation,
+						       type);
 
 		ocfs2_super_unlock(osb, 0);
 	}