[Ocfs2-tools-commits] smushran commits r1117 - in branches/ocfs2-tools-1.0: libocfs2 libocfs2/include mounted.ocfs2

[svn-commits at oss.oracle.com]

Author: smushran
Signed-off-by: mfasheh
Date: 2005-11-08 17:06:16 -0600 (Tue, 08 Nov 2005)
New Revision: 1117

Modified:
   branches/ocfs2-tools-1.0/libocfs2/checkhb.c
   branches/ocfs2-tools-1.0/libocfs2/include/ocfs2.h
   branches/ocfs2-tools-1.0/mounted.ocfs2/mounted.c
Log:
disable ocfs2_check_mount_point in mounted.ocfs2
Signed-Off-by: mfasheh

Modified: branches/ocfs2-tools-1.0/libocfs2/checkhb.c
===================================================================
--- branches/ocfs2-tools-1.0/libocfs2/checkhb.c	2005-11-08 22:15:57 UTC (rev 1116)
+++ branches/ocfs2-tools-1.0/libocfs2/checkhb.c	2005-11-08 23:06:16 UTC (rev 1117)
@@ -86,7 +86,7 @@
  * 	OCFS2_MF_BUSY
  * 	OCFS2_MF_MOUNTED_CLUSTER	if mounted on cluster
  */
-errcode_t ocfs2_check_heartbeats(struct list_head *dev_list)
+errcode_t ocfs2_check_heartbeats(struct list_head *dev_list, int ignore_local)
 {
 	ocfs2_filesys *fs = NULL;
 	errcode_t ret = 0;
@@ -108,9 +108,12 @@
 			dev->fs_type = 2;
 
 		/* is it locally mounted */
-		ret = ocfs2_check_mount_point(device, &dev->mount_flags, NULL, 0);
-		if (ret)
-			goto bail;
+		if (!ignore_local) {
+			ret = ocfs2_check_mount_point(device, &dev->mount_flags,
+						      NULL, 0);
+			if (ret)
+				goto bail;
+		}
 
 		/* get label/uuid for ocfs2 */
 		dev->max_slots = OCFS2_RAW_SB(fs->fs_super)->s_max_slots;

Modified: branches/ocfs2-tools-1.0/libocfs2/include/ocfs2.h
===================================================================
--- branches/ocfs2-tools-1.0/libocfs2/include/ocfs2.h	2005-11-08 22:15:57 UTC (rev 1116)
+++ branches/ocfs2-tools-1.0/libocfs2/include/ocfs2.h	2005-11-08 23:06:16 UTC (rev 1117)
@@ -446,7 +446,7 @@
 errcode_t ocfs2_check_heartbeat(char *device, int *mount_flags,
 				struct list_head *nodes_list);
 
-errcode_t ocfs2_check_heartbeats(struct list_head *dev_list);
+errcode_t ocfs2_check_heartbeats(struct list_head *dev_list, int ignore_local);
 
 errcode_t ocfs2_get_ocfs1_label(char *device, uint8_t *label, uint16_t label_len,
 				uint8_t *uuid, uint16_t uuid_len);

Modified: branches/ocfs2-tools-1.0/mounted.ocfs2/mounted.c
===================================================================
--- branches/ocfs2-tools-1.0/mounted.ocfs2/mounted.c	2005-11-08 22:15:57 UTC (rev 1116)
+++ branches/ocfs2-tools-1.0/mounted.ocfs2/mounted.c	2005-11-08 23:06:16 UTC (rev 1117)
@@ -249,7 +249,7 @@
 		}
 	}
 
-	ret = ocfs2_check_heartbeats(&dev_list);
+	ret = ocfs2_check_heartbeats(&dev_list, 1);
 	if (ret) {
 		com_err(progname, ret, "while detecting heartbeat");
 		goto bail;