1997-04-26 17:21:57 +04:00
|
|
|
/*
|
|
|
|
* expand.c --- expand an ext2fs directory
|
|
|
|
*
|
1999-09-15 00:21:26 +04:00
|
|
|
* Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999 Theodore Ts'o.
|
1997-04-29 20:17:09 +04:00
|
|
|
*
|
|
|
|
* %Begin-Header%
|
|
|
|
* This file may be redistributed under the terms of the GNU Public
|
|
|
|
* License.
|
|
|
|
* %End-Header%
|
1997-04-26 17:21:57 +04:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
1997-08-11 03:07:40 +04:00
|
|
|
#if HAVE_UNISTD_H
|
1997-04-26 17:21:57 +04:00
|
|
|
#include <unistd.h>
|
1997-08-11 03:07:40 +04:00
|
|
|
#endif
|
1997-04-26 17:34:30 +04:00
|
|
|
|
Many files:
inode.c (ext2fs_open_inode_scan): Initialize the group variables
so that we don't need to call get_next_blockgroup() the first
time around. Saves a bit of time, and prevents us from
needing to assign -1 to current_group (which is an unsigned
value).
icount.c (insert_icount_el): Cast the estimated number of inodes
from a float to an ino_t.
alloc.c, alloc_tables.c, badlbocks.c, bb_compat.c, bb_inode.c,
bitmaps.c, bitops.c, block.c, bmap.c, bmove.c, brel_ma.c,
check_desc.c, closefs.c, cmp_bitmaps.c, dblist.c,
dblist_dir.c, dir_iterate.c, dirblock.c, dupfs.c, expanddir.c,
ext2fs.h, fileio.c, freefs.c, get_pathname.c, getsize.c,
icount.c, initialize.c, inline.c, inode.c, irel_ma.c,
ismounted.c, link.c, lookup.c, mkdir.c, namei.c, native.c,
newdir.c, openfs.c, read_bb.c, read_bb_file.c, rs_bitmap.c,
rw_bitmaps.c, swapfs.c, test_io.c, tst_badblocks.c,
tst_getsize.c, tst_iscan.c, unix_io.c, unlink.c, valid_blk.c,
version.c: If EXT2_FLAT_INCLUDES is defined, then assume all
of the ext2-specific header files are in a flat directory.
block.c, bmove.c, dirblock.c, fileio.c: Explicitly cast
all assignments from void * to be compatible with C++.
closefs.c (ext2fs_flush): Add a call to io_channel_flush() to
make sure the contents of the disk are flushed to disk.
dblist.c (ext2fs_add_dir_block): Change new to be new_entry to
avoid C++ namespace clash.
bitmaps.c (ext2fs_copy_bitmap): Change new to be new_map to
avoid C++ namespace clash.
ext2fs.h, bb_inode.c, block.c, bmove.c, brel.h, brel_ma.c,
irel.h, irel_ma.c, dblist.c, dblist_dir.c, dir_iterate.c,
ext2fsP.h, expanddir.c, get_pathname.c, inode.c, link.c,
unlink.c: Change private to be priv_data (to avoid C++
namespace clash)
1998-01-19 17:47:53 +03:00
|
|
|
#include "ext2_fs.h"
|
1997-04-26 17:21:57 +04:00
|
|
|
#include "ext2fs.h"
|
|
|
|
|
|
|
|
struct expand_dir_struct {
|
1999-09-15 00:21:26 +04:00
|
|
|
int done;
|
|
|
|
int newblocks;
|
1997-04-26 17:21:57 +04:00
|
|
|
errcode_t err;
|
|
|
|
};
|
|
|
|
|
2003-12-07 09:28:50 +03:00
|
|
|
static int expand_dir_proc(ext2_filsys fs,
|
|
|
|
blk_t *blocknr,
|
|
|
|
e2_blkcnt_t blockcnt,
|
|
|
|
blk_t ref_block EXT2FS_ATTR((unused)),
|
|
|
|
int ref_offset EXT2FS_ATTR((unused)),
|
|
|
|
void *priv_data)
|
1997-04-26 17:21:57 +04:00
|
|
|
{
|
Many files:
inode.c (ext2fs_open_inode_scan): Initialize the group variables
so that we don't need to call get_next_blockgroup() the first
time around. Saves a bit of time, and prevents us from
needing to assign -1 to current_group (which is an unsigned
value).
icount.c (insert_icount_el): Cast the estimated number of inodes
from a float to an ino_t.
alloc.c, alloc_tables.c, badlbocks.c, bb_compat.c, bb_inode.c,
bitmaps.c, bitops.c, block.c, bmap.c, bmove.c, brel_ma.c,
check_desc.c, closefs.c, cmp_bitmaps.c, dblist.c,
dblist_dir.c, dir_iterate.c, dirblock.c, dupfs.c, expanddir.c,
ext2fs.h, fileio.c, freefs.c, get_pathname.c, getsize.c,
icount.c, initialize.c, inline.c, inode.c, irel_ma.c,
ismounted.c, link.c, lookup.c, mkdir.c, namei.c, native.c,
newdir.c, openfs.c, read_bb.c, read_bb_file.c, rs_bitmap.c,
rw_bitmaps.c, swapfs.c, test_io.c, tst_badblocks.c,
tst_getsize.c, tst_iscan.c, unix_io.c, unlink.c, valid_blk.c,
version.c: If EXT2_FLAT_INCLUDES is defined, then assume all
of the ext2-specific header files are in a flat directory.
block.c, bmove.c, dirblock.c, fileio.c: Explicitly cast
all assignments from void * to be compatible with C++.
closefs.c (ext2fs_flush): Add a call to io_channel_flush() to
make sure the contents of the disk are flushed to disk.
dblist.c (ext2fs_add_dir_block): Change new to be new_entry to
avoid C++ namespace clash.
bitmaps.c (ext2fs_copy_bitmap): Change new to be new_map to
avoid C++ namespace clash.
ext2fs.h, bb_inode.c, block.c, bmove.c, brel.h, brel_ma.c,
irel.h, irel_ma.c, dblist.c, dblist_dir.c, dir_iterate.c,
ext2fsP.h, expanddir.c, get_pathname.c, inode.c, link.c,
unlink.c: Change private to be priv_data (to avoid C++
namespace clash)
1998-01-19 17:47:53 +03:00
|
|
|
struct expand_dir_struct *es = (struct expand_dir_struct *) priv_data;
|
1997-04-26 17:21:57 +04:00
|
|
|
blk_t new_blk;
|
|
|
|
static blk_t last_blk = 0;
|
|
|
|
char *block;
|
|
|
|
errcode_t retval;
|
|
|
|
|
|
|
|
if (*blocknr) {
|
|
|
|
last_blk = *blocknr;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
retval = ext2fs_new_block(fs, last_blk, 0, &new_blk);
|
|
|
|
if (retval) {
|
|
|
|
es->err = retval;
|
|
|
|
return BLOCK_ABORT;
|
|
|
|
}
|
|
|
|
if (blockcnt > 0) {
|
|
|
|
retval = ext2fs_new_dir_block(fs, 0, 0, &block);
|
|
|
|
if (retval) {
|
|
|
|
es->err = retval;
|
|
|
|
return BLOCK_ABORT;
|
|
|
|
}
|
|
|
|
es->done = 1;
|
1997-11-24 14:44:25 +03:00
|
|
|
retval = ext2fs_write_dir_block(fs, new_blk, block);
|
1997-04-26 17:21:57 +04:00
|
|
|
} else {
|
2003-08-01 17:41:07 +04:00
|
|
|
retval = ext2fs_get_mem(fs->blocksize, &block);
|
1997-10-26 06:41:24 +03:00
|
|
|
if (retval) {
|
|
|
|
es->err = retval;
|
1997-04-26 17:21:57 +04:00
|
|
|
return BLOCK_ABORT;
|
|
|
|
}
|
|
|
|
memset(block, 0, fs->blocksize);
|
1997-11-24 14:44:25 +03:00
|
|
|
retval = io_channel_write_blk(fs->io, new_blk, 1, block);
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
|
|
|
if (retval) {
|
|
|
|
es->err = retval;
|
|
|
|
return BLOCK_ABORT;
|
|
|
|
}
|
2003-08-01 17:41:07 +04:00
|
|
|
ext2fs_free_mem(&block);
|
1997-04-26 17:21:57 +04:00
|
|
|
*blocknr = new_blk;
|
dir_iterate.c (ext2fs_dir_iterate2, ext2fs_process_dir_block):
Add support for a new flag, DIRENT_FLAG_INCLUDE_REMOVED,
which will return deleted directory entries.
ext2fs_dir_iterate2 takes a new callback function which
is identical with the one used by
ext2fs_dblist_dir_iterate(). If the directory entry is
deleted, the callback function will be called with the
entry paraemter set to DIRENT_DELETED_FILE.
Makefile.in, alloc_stats.c (ext2fs_inode_alloc_stats,
ext2fs_block_alloc_stats): New functions which update
block/inode allocation statistics in the bitmaps, block
group descriptors, and superblock.
mkjournal.c (mkjournal_proc), mkdir.c (ext2fs_mkdir),
expanddir.c (expand_dir_proc), bb_inode.c
(clear_bad_block_proc, set_bad_block_proc,
ext2fs_update_bb_inode), alloc.c (ext2fs_alloc_block):
Update to use new block/inode allocation statistics.
2002-01-03 11:29:19 +03:00
|
|
|
ext2fs_block_alloc_stats(fs, new_blk, +1);
|
1999-09-15 00:21:26 +04:00
|
|
|
es->newblocks++;
|
|
|
|
|
1997-04-26 17:21:57 +04:00
|
|
|
if (es->done)
|
|
|
|
return (BLOCK_CHANGED | BLOCK_ABORT);
|
|
|
|
else
|
|
|
|
return BLOCK_CHANGED;
|
|
|
|
}
|
|
|
|
|
Many files:
alloc.c, bb_inode.c, bitmaps.c, bitops.h, block.c, bmap.c, bmove.c,
brel.h, cmp_bitmaps.c, dblist.c, dblist_dir.c, dir_iterate.c,
expanddir.c, ext2fs.h, ext2fsP.h, fileio.c, finddev.c, get_pathname.c,
icount.c, inode.c, irel.h, irel_ma.c, ismounted.c, link.c, lookup.c,
mkdir.c, mkjournal.c, namei.c, newdir.c, read_bb_file.c, test_io.c,
tst_iscan.c, unix_io.c, unlink.c: Change use of ino_t to ext2_ino_t,
to protect applications that attempt to compile
-D_FILE_OFFSET_BITS=64, since this inexplicably changes ino_t(!?). So
we use ext2_ino_t to avoid an unexpected ABI change.
2001-01-11 07:54:39 +03:00
|
|
|
errcode_t ext2fs_expand_dir(ext2_filsys fs, ext2_ino_t dir)
|
1997-04-26 17:21:57 +04:00
|
|
|
{
|
|
|
|
errcode_t retval;
|
|
|
|
struct expand_dir_struct es;
|
|
|
|
struct ext2_inode inode;
|
|
|
|
|
1997-04-26 17:34:30 +04:00
|
|
|
EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
|
|
|
|
|
1997-04-26 17:21:57 +04:00
|
|
|
if (!(fs->flags & EXT2_FLAG_RW))
|
|
|
|
return EXT2_ET_RO_FILSYS;
|
|
|
|
|
1997-11-24 14:44:25 +03:00
|
|
|
if (!fs->block_map)
|
|
|
|
return EXT2_ET_NO_BLOCK_BITMAP;
|
|
|
|
|
1997-04-26 17:21:57 +04:00
|
|
|
retval = ext2fs_check_directory(fs, dir);
|
|
|
|
if (retval)
|
|
|
|
return retval;
|
|
|
|
|
|
|
|
es.done = 0;
|
|
|
|
es.err = 0;
|
1999-09-15 00:21:26 +04:00
|
|
|
es.newblocks = 0;
|
1997-04-26 17:21:57 +04:00
|
|
|
|
Many files:
block.c (ext2fs_block_iterate3): Make the ref_offset field contain the
offset into the inode.i_blocks array when ref_block is zero. Since we
haven't done a formal release of e2fsprogs since block_iterate2 was
first introduced, I removed block_iterate2, and renamed block_iterate3
to be block_iterate2.
bb_inode.c, bmove.c, dblist_dir.c, dir_iterate.c, expanddir.c,
ext2fs.h, ext2fsP.h, read_bb.c: Change use of block_iterate and
block_iterate2 to block_iterate2 with the new prototype for the
interator function. (using blkcnt_t forr blockcount)
ChangeLog, debugfs.c, ls.c, lsdel.c:
debugfs.c, ls.c, lsdel.c: Add support for large files. (The high 32
bits share space with the i_dir_acl field.)
1998-03-24 19:17:51 +03:00
|
|
|
retval = ext2fs_block_iterate2(fs, dir, BLOCK_FLAG_APPEND,
|
|
|
|
0, expand_dir_proc, &es);
|
1997-04-26 17:21:57 +04:00
|
|
|
|
|
|
|
if (es.err)
|
|
|
|
return es.err;
|
|
|
|
if (!es.done)
|
|
|
|
return EXT2_ET_EXPAND_DIR_ERR;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Update the size and block count fields in the inode.
|
|
|
|
*/
|
|
|
|
retval = ext2fs_read_inode(fs, dir, &inode);
|
|
|
|
if (retval)
|
|
|
|
return retval;
|
|
|
|
|
|
|
|
inode.i_size += fs->blocksize;
|
1999-09-15 00:21:26 +04:00
|
|
|
inode.i_blocks += (fs->blocksize / 512) * es.newblocks;
|
1997-04-26 17:21:57 +04:00
|
|
|
|
|
|
|
retval = ext2fs_write_inode(fs, dir, &inode);
|
|
|
|
if (retval)
|
|
|
|
return retval;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|