build: fix build warnings for MacOS

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

diff --git a/lib/ext2fs/expanddir.c b/lib/ext2fs/expanddir.c
index 3c2c803..41c4088 100644 (file)
--- a/lib/ext2fs/expanddir.c
+++ b/lib/ext2fs/expanddir.c
@@ -1,14 +1,15 @@
 /*
  * expand.c --- expand an ext2fs directory
- * 
+ *
  * 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
- * License.
+ * This file may be redistributed under the terms of the GNU Library
+ * General Public License, version 2.
  * %End-Header%
  */
 
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
 #if HAVE_UNISTD_H
@@ -21,30 +22,38 @@
 struct expand_dir_struct {
        int             done;
        int             newblocks;
+       blk64_t         goal;
        errcode_t       err;
 };
 
-static int expand_dir_proc(ext2_filsys         fs,
-                          blk_t                *blocknr,
-                          e2_blkcnt_t          blockcnt,
-                          blk_t                ref_block,
-                          int                  ref_offset,
-                          void                 *priv_data)
+static int expand_dir_proc(ext2_filsys fs,
+                          blk64_t      *blocknr,
+                          e2_blkcnt_t  blockcnt,
+                          blk64_t      ref_block EXT2FS_ATTR((unused)),
+                          int          ref_offset EXT2FS_ATTR((unused)),
+                          void         *priv_data)
 {
        struct expand_dir_struct *es = (struct expand_dir_struct *) priv_data;
-       blk_t   new_blk;
-       static blk_t    last_blk = 0;
+       blk64_t new_blk;
        char            *block;
        errcode_t       retval;
-       
+
        if (*blocknr) {
-               last_blk = *blocknr;
+               if (blockcnt >= 0)
+                       es->goal = *blocknr;
                return 0;
        }
-       retval = ext2fs_new_block(fs, last_blk, 0, &new_blk);
-       if (retval) {
-               es->err = retval;
-               return BLOCK_ABORT;
+       if (blockcnt &&
+           (EXT2FS_B2C(fs, es->goal) == EXT2FS_B2C(fs, es->goal+1)))
+               new_blk = es->goal+1;
+       else {
+               es->goal &= ~EXT2FS_CLUSTER_MASK(fs);
+               retval = ext2fs_new_block2(fs, es->goal, 0, &new_blk);
+               if (retval) {
+                       es->err = retval;
+                       return BLOCK_ABORT;
+               }
+               es->newblocks++;
        }
        if (blockcnt > 0) {
                retval = ext2fs_new_dir_block(fs, 0, 0, &block);
@@ -61,16 +70,17 @@ static int expand_dir_proc(ext2_filsys              fs,
                        return BLOCK_ABORT;
                }
                memset(block, 0, fs->blocksize);
-               retval = io_channel_write_blk(fs->io, new_blk, 1, block);
-       }       
+               retval = io_channel_write_blk64(fs->io, new_blk, 1, block);
+       }
+       if (blockcnt >= 0)
+               es->goal = new_blk;
        if (retval) {
                es->err = retval;
                return BLOCK_ABORT;
        }
        ext2fs_free_mem(&block);
        *blocknr = new_blk;
-       ext2fs_block_alloc_stats(fs, new_blk, +1);
-       es->newblocks++;
+       ext2fs_block_alloc_stats2(fs, new_blk, +1);
 
        if (es->done)
                return (BLOCK_CHANGED | BLOCK_ABORT);
@@ -83,7 +93,7 @@ errcode_t ext2fs_expand_dir(ext2_filsys fs, ext2_ino_t dir)
        errcode_t       retval;
        struct expand_dir_struct es;
        struct ext2_inode       inode;
-       
+
        EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
 
        if (!(fs->flags & EXT2_FLAG_RW))
@@ -95,12 +105,13 @@ errcode_t ext2fs_expand_dir(ext2_filsys fs, ext2_ino_t dir)
        retval = ext2fs_check_directory(fs, dir);
        if (retval)
                return retval;
-       
+
        es.done = 0;
        es.err = 0;
+       es.goal = 0;
        es.newblocks = 0;
-       
-       retval = ext2fs_block_iterate2(fs, dir, BLOCK_FLAG_APPEND,
+
+       retval = ext2fs_block_iterate3(fs, dir, BLOCK_FLAG_APPEND,
                                       0, expand_dir_proc, &es);
 
        if (es.err)
@@ -114,9 +125,9 @@ errcode_t ext2fs_expand_dir(ext2_filsys fs, ext2_ino_t dir)
        retval = ext2fs_read_inode(fs, dir, &inode);
        if (retval)
                return retval;
-       
+
        inode.i_size += fs->blocksize;
-       inode.i_blocks += (fs->blocksize / 512) * es.newblocks;
+       ext2fs_iblk_add_blocks(fs, &inode, es.newblocks);
 
        retval = ext2fs_write_inode(fs, dir, &inode);
        if (retval)