[Ocfs-tools-commits] jlbec commits r98 - trunk/ocfs2/debugfs.ocfs2

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2004-06-24 19:27:19 -0500 (Thu, 24 Jun 2004)
New Revision: 98

Modified:
   trunk/ocfs2/debugfs.ocfs2/
   trunk/ocfs2/debugfs.ocfs2/dump.c
   trunk/ocfs2/debugfs.ocfs2/readfs.c
Log:

o Fix superblock probing of >512B blocksize
o Print "Clusters" for the total number of clusters.




Property changes on: trunk/ocfs2/debugfs.ocfs2
___________________________________________________________________
Name: svn:ignore
   - cscope.out
debugfs.ocfs2
cscope.files

   + cscope.out
debugfs.ocfs2
cscope.files
.*.sw?


Modified: trunk/ocfs2/debugfs.ocfs2/dump.c
===================================================================
--- trunk/ocfs2/debugfs.ocfs2/dump.c	2004-06-25 00:06:21 UTC (rev 97)
+++ trunk/ocfs2/debugfs.ocfs2/dump.c	2004-06-25 00:27:19 UTC (rev 98)
@@ -86,7 +86,7 @@
 Inode: 32001   Type: directory    Mode:  0755   Flags: 0x0   Generation: 721849
 User:     0   Group:     0   Size: 4096
 File ACL: 0    Directory ACL: 0
-Links: 10   Blockcount: 8
+Links: 10   Clusters: 8
 Fragment:  Address: 0    Number: 0    Size: 0
 ctime: 0x40075ba0 -- Thu Jan 15 22:33:52 2004
 atime: 0x40075b9d -- Thu Jan 15 22:33:49 2004
@@ -98,7 +98,7 @@
 Inode: 64004   Type: regular    Mode:  0644   Flags: 0x0   Generation: 721925
 User:     0   Group:     0   Size: 1006409
 File ACL: 0    Directory ACL: 0
-Links: 1   Blockcount: 1976
+Links: 1   Clusters: 1976
 Fragment:  Address: 0    Number: 0    Size: 0
 ctime: 0x40075b9d -- Thu Jan 15 22:33:49 2004
 atime: 0x40075b9d -- Thu Jan 15 22:33:49 2004
@@ -159,7 +159,7 @@
 	       in->i_gid, (gr ? gr->gr_name : "unknown"),
 	       in->i_size);
 
-	printf("Links: %u   Blockcount: %u\n", in->i_links_count, in->i_clusters);
+	printf("Links: %u   Clusters: %u\n", in->i_links_count, in->i_clusters);
 
 	dl = &(in->i_disk_lock);
 	printf("Lock Master: %u   Level: 0x%0x   Seqnum: %llu\n",

Modified: trunk/ocfs2/debugfs.ocfs2/readfs.c
===================================================================
--- trunk/ocfs2/debugfs.ocfs2/readfs.c	2004-06-25 00:06:21 UTC (rev 97)
+++ trunk/ocfs2/debugfs.ocfs2/readfs.c	2004-06-25 00:27:19 UTC (rev 98)
@@ -77,16 +77,18 @@
 			DBGFS_FATAL("%s", strerror(errno));
 
 		di = (ocfs2_dinode *) *buf;
-		if (memcmp(di->i_signature, OCFS2_SUPER_BLOCK_SIGNATURE,
+		if (!memcmp(di->i_signature,
+                            OCFS2_SUPER_BLOCK_SIGNATURE,
 			   strlen(OCFS2_SUPER_BLOCK_SIGNATURE))) {
-			printf("Not an OCFS2 volume.\n");
-			goto bail;
-		} else {
 			ret = 0;
 			break;
 		}
 		safefree (*buf);
 	}
+
+        if (bits >= 13)
+            printf("Not an OCFS2 volume");
+
 bail:
 	return ret;
 }				/* read_super_block */