Use MKINSTALLDIRS macro so that the Makefiles can find the script

[tools/e2fsprogs.git] / lib / ext2fs / expanddir.c

diff --git a/lib/ext2fs/expanddir.c b/lib/ext2fs/expanddir.c
index 852b40f..10a5149 100644 (file)
--- a/lib/ext2fs/expanddir.c
+++ b/lib/ext2fs/expanddir.c
@@ -1,7 +1,7 @@
 /*
  * expand.c --- expand an ext2fs directory
  * 
- * Copyright (C) 1993, 1994, 1995, 1996 Theodore Ts'o.
+ * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999  Theodore Ts'o.
  *
  * %Begin-Header%
  * This file may be redistributed under the terms of the GNU Public
@@ -11,32 +11,31 @@
 
 #include <stdio.h>
 #include <string.h>
+#if HAVE_UNISTD_H
 #include <unistd.h>
-#include <stdlib.h>
-#if HAVE_ERRNO_H
-#include <errno.h>
 #endif
 
-#include <linux/ext2_fs.h>
-
+#include "ext2_fs.h"
 #include "ext2fs.h"
 
 struct expand_dir_struct {
-       int     done;
+       int             done;
+       int             newblocks;
        errcode_t       err;
 };
 
-static int expand_dir_proc(ext2_filsys fs,
+static int expand_dir_proc(ext2_filsys fs,
                           blk_t        *blocknr,
-                          int  blockcnt,
-                          void *private)
+                          e2_blkcnt_t  blockcnt,
+                          blk_t        ref_block EXT2FS_ATTR((unused)),
+                          int          ref_offset EXT2FS_ATTR((unused)),
+                          void         *priv_data)
 {
-       struct expand_dir_struct *es = (struct expand_dir_struct *) private;
+       struct expand_dir_struct *es = (struct expand_dir_struct *) priv_data;
        blk_t   new_blk;
        static blk_t    last_blk = 0;
        char            *block;
        errcode_t       retval;
-       int             group;
        
        if (*blocknr) {
                last_blk = *blocknr;
@@ -54,34 +53,32 @@ static int expand_dir_proc(ext2_filsys fs,
                        return BLOCK_ABORT;
                }
                es->done = 1;
+               retval = ext2fs_write_dir_block(fs, new_blk, block);
        } else {
-               block = malloc(fs->blocksize);
-               if (!block) {
-                       es->err = ENOMEM;
+               retval = ext2fs_get_mem(fs->blocksize, &block);
+               if (retval) {
+                       es->err = retval;
                        return BLOCK_ABORT;
                }
                memset(block, 0, fs->blocksize);
+               retval = io_channel_write_blk(fs->io, new_blk, 1, block);
        }       
-       retval = ext2fs_write_dir_block(fs, new_blk, block);
        if (retval) {
                es->err = retval;
                return BLOCK_ABORT;
        }
-       free(block);
+       ext2fs_free_mem(&block);
        *blocknr = new_blk;
-       ext2fs_mark_block_bitmap(fs->block_map, new_blk);
-       ext2fs_mark_bb_dirty(fs);
-       group = ext2fs_group_of_blk(fs, new_blk);
-       fs->group_desc[group].bg_free_blocks_count--;
-       fs->super->s_free_blocks_count--;
-       ext2fs_mark_super_dirty(fs);
+       ext2fs_block_alloc_stats(fs, new_blk, +1);
+       es->newblocks++;
+
        if (es->done)
                return (BLOCK_CHANGED | BLOCK_ABORT);
        else
                return BLOCK_CHANGED;
 }
 
-errcode_t ext2fs_expand_dir(ext2_filsys fs, ino_t dir)
+errcode_t ext2fs_expand_dir(ext2_filsys fs, ext2_ino_t dir)
 {
        errcode_t       retval;
        struct expand_dir_struct es;
@@ -92,15 +89,19 @@ errcode_t ext2fs_expand_dir(ext2_filsys fs, ino_t dir)
        if (!(fs->flags & EXT2_FLAG_RW))
                return EXT2_ET_RO_FILSYS;
 
+       if (!fs->block_map)
+               return EXT2_ET_NO_BLOCK_BITMAP;
+
        retval = ext2fs_check_directory(fs, dir);
        if (retval)
                return retval;
        
        es.done = 0;
        es.err = 0;
+       es.newblocks = 0;
        
-       retval = ext2fs_block_iterate(fs, dir, BLOCK_FLAG_APPEND,
-                                     0, expand_dir_proc, &es);
+       retval = ext2fs_block_iterate2(fs, dir, BLOCK_FLAG_APPEND,
+                                      0, expand_dir_proc, &es);
 
        if (es.err)
                return es.err;
@@ -115,7 +116,7 @@ errcode_t ext2fs_expand_dir(ext2_filsys fs, ino_t dir)
                return retval;
        
        inode.i_size += fs->blocksize;
-       inode.i_blocks += fs->blocksize / 512;
+       inode.i_blocks += (fs->blocksize / 512) * es.newblocks;
 
        retval = ext2fs_write_inode(fs, dir, &inode);
        if (retval)