[commit] r2816 - ofw/fs/ext2fs

[repository service]

Author: wmb
Date: Wed Jan 11 02:45:49 2012
New Revision: 2816
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2816

Log:
EXT2/3/4 filesystem - OLPC trac #11184 - fixed problem with journal recovery on EXT4.

Modified:
   ofw/fs/ext2fs/layout.fth

Modified: ofw/fs/ext2fs/layout.fth
==============================================================================
--- ofw/fs/ext2fs/layout.fth	Wed Jan 11 01:42:44 2012	(r2815)
+++ ofw/fs/ext2fs/layout.fth	Wed Jan 11 02:45:49 2012	(r2816)
@@ -226,11 +226,16 @@
          drop  exit             ( -- )
       then                      ( d.pblk# )
    else			        ( adr lblk# )  \ find or allocate physical block
-      get-pblk#	u>d		( adr d.pblk# )
+      extent?  if	        ( adr lblk# )
+         >d.pblk#  0= abort" EXT4: Allocating blocks inside extents not yet supported"
+				( adr d.pblk# )
+      else		        ( adr lblk# )
+         get-pblk# u>d		( adr d.pblk# )
+      then			( adr d.pblk# )
    then
 \ This interferes with journal recovery
 \  dup h# f8 < if  dup . ." attempt to destroy file system" cr abort  then
-   block bsize move update
+   d.block bsize move update
 ;