[commit] r1739 - ofw/fs/ext2fs

[repository service]

Author: wmb
Date: Sat Feb 13 06:52:26 2010
New Revision: 1739
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1739

Log:
OLPC trac 9972 - ext2 filesystem package - fixed a bug in the calculation of backup group descriptor block numbers when the block size is not 1K.

Modified:
   ofw/fs/ext2fs/bitmap.fth
   ofw/fs/ext2fs/sb.fth

Modified: ofw/fs/ext2fs/bitmap.fth
==============================================================================
--- ofw/fs/ext2fs/bitmap.fth	Sat Feb 13 06:50:43 2010	(r1738)
+++ ofw/fs/ext2fs/bitmap.fth	Sat Feb 13 06:52:26 2010	(r1739)
@@ -169,7 +169,7 @@
       \ the block bitmap number in the group descriptor.  If it is larger than
       \ the calculated block number, do the backup.
       #groups 1  do
-         i bpg *  2+			( possible-gn )
+         i bpg *  gds-fs-block# +	( possible-gn )
          dup  i block-bitmap <  if	( possible-gn )
             block			( gdn-adr )
             0 group-desc		( gdn-adr gd0-adr )

Modified: ofw/fs/ext2fs/sb.fth
==============================================================================
--- ofw/fs/ext2fs/sb.fth	Sat Feb 13 06:50:43 2010	(r1738)
+++ ofw/fs/ext2fs/sb.fth	Sat Feb 13 06:52:26 2010	(r1739)
@@ -90,7 +90,7 @@
 ;

: gds-fs-block#  ( -- fs-block# )
-   bsize d# 1024 =  if  2  else  1  then	( logical block# )
+   datablock0 1+	( logical-block# )
 ;
 : gds-block#  ( -- dev-block# )
    gds-fs-block#  bsize ublock / *		( dev-block# )