[Ocfs2-tools-commits] smushran commits r1167 - in trunk: debugfs.ocfs2 mkfs.ocfs2

[svn-commits@oss.oracle.com]

Author: smushran
Signed-off-by: mfasheh
Date: 2006-02-24 17:55:16 -0600 (Fri, 24 Feb 2006)
New Revision: 1167

Modified:
   trunk/debugfs.ocfs2/main.c
   trunk/mkfs.ocfs2/mkfs.c
Log:
volumesizeinbytes in mkfs made cluster aligned
Signed-off-by: mfasheh

Modified: trunk/debugfs.ocfs2/main.c
===================================================================
--- trunk/debugfs.ocfs2/main.c	2006-02-24 23:08:53 UTC (rev 1166)
+++ trunk/debugfs.ocfs2/main.c	2006-02-24 23:55:16 UTC (rev 1167)
@@ -72,7 +72,7 @@
 static void process_one_list(GList *list, char *action)
 {
 	GList *tmp;
-	struct log_entry *entry;
+	struct log_entry *entry = NULL;
 
 
 	while (list) {

Modified: trunk/mkfs.ocfs2/mkfs.c
===================================================================
--- trunk/mkfs.ocfs2/mkfs.c	2006-02-24 23:08:53 UTC (rev 1166)
+++ trunk/mkfs.ocfs2/mkfs.c	2006-02-24 23:55:16 UTC (rev 1167)
@@ -958,9 +958,11 @@
 
 	s->cluster_size_bits = get_bits(s, s->cluster_size);
 
+	/* volume size needs to be cluster aligned */
 	s->volume_size_in_clusters = s->volume_size_in_bytes >> s->cluster_size_bits;
 	tmp = (uint64_t)s->volume_size_in_clusters;
-	s->volume_size_in_blocks = (tmp << s->cluster_size_bits) >> s->blocksize_bits;
+	s->volume_size_in_bytes = tmp << s->cluster_size_bits;
+	s->volume_size_in_blocks = s->volume_size_in_bytes >> s->blocksize_bits;
 	
 	s->reserved_tail_size = 0;