[Ocfs2-tools-commits] smushran commits r1165 - in tags/ocfs2-tools-1.2.0: libo2cb mounted.ocfs2 tunefs.ocfs2

[svn-commits@oss.oracle.com]

Author: smushran
Date: 2006-02-23 18:41:21 -0600 (Thu, 23 Feb 2006)
New Revision: 1165

Modified:
   tags/ocfs2-tools-1.2.0/libo2cb/o2cb_abi.c
   tags/ocfs2-tools-1.2.0/mounted.ocfs2/mounted.c
   tags/ocfs2-tools-1.2.0/tunefs.ocfs2/tunefs.c
Log:
oops... these patches were to be applied to trunk

Modified: tags/ocfs2-tools-1.2.0/libo2cb/o2cb_abi.c
===================================================================
--- tags/ocfs2-tools-1.2.0/libo2cb/o2cb_abi.c	2006-02-24 00:37:42 UTC (rev 1164)
+++ tags/ocfs2-tools-1.2.0/libo2cb/o2cb_abi.c	2006-02-24 00:41:21 UTC (rev 1165)
@@ -1220,9 +1220,6 @@
 	char path[PATH_MAX];
 	errcode_t ret;
 
-	if (configfs_path == NULL)
-		return O2CB_ET_SERVICE_UNAVAILABLE;
-
 	ret = snprintf(path, PATH_MAX - 1, O2CB_FORMAT_CLUSTER_DIR,
 		       configfs_path);
 	if ((ret <= 0) || (ret == (PATH_MAX - 1)))
@@ -1241,9 +1238,6 @@
 	char path[PATH_MAX];
 	errcode_t ret;
 
-	if (configfs_path == NULL)
-		return O2CB_ET_SERVICE_UNAVAILABLE;
-
 	ret = snprintf(path, PATH_MAX - 1, O2CB_FORMAT_NODE_DIR,
 		       configfs_path, cluster_name);
 	if ((ret <= 0) || (ret == (PATH_MAX - 1)))

Modified: tags/ocfs2-tools-1.2.0/mounted.ocfs2/mounted.c
===================================================================
--- tags/ocfs2-tools-1.2.0/mounted.ocfs2/mounted.c	2006-02-24 00:37:42 UTC (rev 1164)
+++ tags/ocfs2-tools-1.2.0/mounted.ocfs2/mounted.c	2006-02-24 00:41:21 UTC (rev 1165)
@@ -285,8 +285,6 @@
 	if (ret)
 		goto bail;
 
-	o2cb_init();
-
 	ret = ocfs2_detect(device, quick_detect);
 
 bail:

Modified: tags/ocfs2-tools-1.2.0/tunefs.ocfs2/tunefs.c
===================================================================
--- tags/ocfs2-tools-1.2.0/tunefs.ocfs2/tunefs.c	2006-02-24 00:37:42 UTC (rev 1164)
+++ tags/ocfs2-tools-1.2.0/tunefs.ocfs2/tunefs.c	2006-02-24 00:41:21 UTC (rev 1165)
@@ -525,8 +525,6 @@
 	if (ret)
 		goto bail;
 
-	ocfs2_swap_journal_superblock((journal_superblock_t *)buf);
-
 	ret = ocfs2_file_write(ci, buf, BUFLEN, 0, &wrote);
 	if (ret)
 		goto bail;