Changeset 2947

Timestamp:

Apr 20, 2012 9:07:04 AM (13 months ago)

Author:

quozl

Message:

ext2fs - fix inode reference count for directories on filesystems without DIR_NLINK, and maintain directory count in group descriptor, #11787

Location:

ofw/fs/ext2fs

Files:

• bitmap.fth (modified) (1 diff)
• dir.fth (modified) (5 diffs)
• sb.fth (modified) (1 diff)

ofw/fs/ext2fs/bitmap.fth

@@ -76 +76 @@
    r> h# 0e + le-w!         ( )
 ;
-: free-inodes+!  ( n inode# -- )
+: free-inodes+!  ( n group# -- )
    tuck free-inodes@  +   ( group# n' )
    over free-inodes!      ( group# )
    gd-update              ( )
+;
+: used-dirs@   ( group# -- n )
+   group-desc  dup  h# 10 + le-w@   ( adr lo )
+   desc64?  if                      ( adr lo )
+      swap h# 30 + le-w@ wljoin     ( n )
+   else                             ( adr lo )
+      nip                           ( n )
+   then                             ( n )
+;
+: used-dirs!  ( n group# -- )
+   group-desc >r            ( n     r: adr )
+   desc64?  if              ( n     r: adr )
+      lwsplit               ( lo hi r: adr )
+      r@ h# 30 + le-w!      ( lo    r: adr )
+   then                     ( n     r: adr )
+   r> h# 10 + le-w!         ( )
+;
+: used-dirs+!  ( n group# -- )
+   tuck used-dirs@  +   ( group# n' )
+   over used-dirs!      ( group# )
+   gd-update            ( )
 ;
 

ofw/fs/ext2fs/dir.fth

@@ -79 +79 @@
    \ link-count = 1 means that the directory has more links than can
    \ be represented in a 16-bit number; don't increment in that case.
-   dir?  if                ( increment )
+   dir? sb-nlink? and  if  ( increment )
       link-count 1 =  if   ( increment )
          drop exit         ( -- )
@@ -90 +90 @@
    \ We should also set the RO_COMPAT_DIR_NLINK bit in the superblock,
    \ but we assume that OFW won't be used to create enormous directories
-   dir?  if                ( link-count )
+   dir? sb-nlink? and  if  ( link-count )
       dup d# 65000 >=  if  ( link-count )
          drop 1            ( link-count' )
@@ -107 +107 @@
        mtime!                   ( )      \ set modification time
    0 link-count!                ( )      \ link count will be incremented by new-dirent
+   dir?  if
+      1 inode# 1- ipg / used-dirs+!
+   then
    inode#                       ( inode# )
 ;
@@ -215 +218 @@
 \ Delete the currently selected inode. Does not affect the directory entry, if any.
 : idelete   ( -- )
+   dir? if
+      -1 inode# 1- ipg / used-dirs+!
+   then
+
    \ Short symlinks hold no blocks, but have a string in the direct block list,
    \ so we must not interpret that string as a block list.
@@ -277 +284 @@
 
    \ new-inode changed the value of inode#; we must restore it so
-   \ new-dirent can find info about the containing diretory 
+   \ new-dirent can find info about the containing directory
    wd-inum set-inode    ( name$ inode# )
 

ofw/fs/ext2fs/sb.fth

@@ -58 +58 @@
 : sb-extents?  ( -- flag )  incompat-flags h# 40 and  0<>  ;
 : sb-gd-csum?  ( -- flag )  ro-flags       h# 10 and  0<>  ;
+: sb-nlink?    ( -- flag )  ro-flags       h# 20 and  0<>  ;
 
 \ Don't write to a disk that uses extensions we don't understand