[Ocfs2-tools-commits] manish commits r908 - trunk/mkfs.ocfs2

[svn-commits at oss.oracle.com]

Author: manish
Date: 2005-05-23 16:39:32 -0500 (Mon, 23 May 2005)
New Revision: 908

Modified:
   trunk/mkfs.ocfs2/mkfs.c
Log:
Honor specified size in blocks always


Modified: trunk/mkfs.ocfs2/mkfs.c
===================================================================
--- trunk/mkfs.ocfs2/mkfs.c	2005-05-20 19:50:49 UTC (rev 907)
+++ trunk/mkfs.ocfs2/mkfs.c	2005-05-23 21:39:32 UTC (rev 908)
@@ -831,8 +831,12 @@
 			}
 		}
 
-		err = ocfs2_get_device_size(s->device_name, s->blocksize, &ret);
-		s->volume_size_in_blocks = ret;
+		if (!s->specified_size_in_blocks) {
+			err = ocfs2_get_device_size(s->device_name,
+						    s->blocksize, &ret);
+			s->volume_size_in_blocks = ret;
+		} else
+			s->volume_size_in_blocks = s->specified_size_in_blocks;
 
 		s->volume_size_in_bytes =
 			s->volume_size_in_blocks * s->blocksize;