diff options
Diffstat (limited to 'e2fsprogs/ext2fs/expanddir.c')
-rw-r--r-- | e2fsprogs/ext2fs/expanddir.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/e2fsprogs/ext2fs/expanddir.c b/e2fsprogs/ext2fs/expanddir.c index 10a5149cf..c148b93aa 100644 --- a/e2fsprogs/ext2fs/expanddir.c +++ b/e2fsprogs/ext2fs/expanddir.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * expand.c --- expand an ext2fs directory | 2 | * expand.c --- expand an ext2fs directory |
3 | * | 3 | * |
4 | * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999 Theodore Ts'o. | 4 | * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999 Theodore Ts'o. |
5 | * | 5 | * |
6 | * %Begin-Header% | 6 | * %Begin-Header% |
@@ -36,7 +36,7 @@ static int expand_dir_proc(ext2_filsys fs, | |||
36 | static blk_t last_blk = 0; | 36 | static blk_t last_blk = 0; |
37 | char *block; | 37 | char *block; |
38 | errcode_t retval; | 38 | errcode_t retval; |
39 | 39 | ||
40 | if (*blocknr) { | 40 | if (*blocknr) { |
41 | last_blk = *blocknr; | 41 | last_blk = *blocknr; |
42 | return 0; | 42 | return 0; |
@@ -62,7 +62,7 @@ static int expand_dir_proc(ext2_filsys fs, | |||
62 | } | 62 | } |
63 | memset(block, 0, fs->blocksize); | 63 | memset(block, 0, fs->blocksize); |
64 | retval = io_channel_write_blk(fs->io, new_blk, 1, block); | 64 | retval = io_channel_write_blk(fs->io, new_blk, 1, block); |
65 | } | 65 | } |
66 | if (retval) { | 66 | if (retval) { |
67 | es->err = retval; | 67 | es->err = retval; |
68 | return BLOCK_ABORT; | 68 | return BLOCK_ABORT; |
@@ -83,7 +83,7 @@ errcode_t ext2fs_expand_dir(ext2_filsys fs, ext2_ino_t dir) | |||
83 | errcode_t retval; | 83 | errcode_t retval; |
84 | struct expand_dir_struct es; | 84 | struct expand_dir_struct es; |
85 | struct ext2_inode inode; | 85 | struct ext2_inode inode; |
86 | 86 | ||
87 | EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS); | 87 | EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS); |
88 | 88 | ||
89 | if (!(fs->flags & EXT2_FLAG_RW)) | 89 | if (!(fs->flags & EXT2_FLAG_RW)) |
@@ -95,11 +95,11 @@ errcode_t ext2fs_expand_dir(ext2_filsys fs, ext2_ino_t dir) | |||
95 | retval = ext2fs_check_directory(fs, dir); | 95 | retval = ext2fs_check_directory(fs, dir); |
96 | if (retval) | 96 | if (retval) |
97 | return retval; | 97 | return retval; |
98 | 98 | ||
99 | es.done = 0; | 99 | es.done = 0; |
100 | es.err = 0; | 100 | es.err = 0; |
101 | es.newblocks = 0; | 101 | es.newblocks = 0; |
102 | 102 | ||
103 | retval = ext2fs_block_iterate2(fs, dir, BLOCK_FLAG_APPEND, | 103 | retval = ext2fs_block_iterate2(fs, dir, BLOCK_FLAG_APPEND, |
104 | 0, expand_dir_proc, &es); | 104 | 0, expand_dir_proc, &es); |
105 | 105 | ||
@@ -114,7 +114,7 @@ errcode_t ext2fs_expand_dir(ext2_filsys fs, ext2_ino_t dir) | |||
114 | retval = ext2fs_read_inode(fs, dir, &inode); | 114 | retval = ext2fs_read_inode(fs, dir, &inode); |
115 | if (retval) | 115 | if (retval) |
116 | return retval; | 116 | return retval; |
117 | 117 | ||
118 | inode.i_size += fs->blocksize; | 118 | inode.i_size += fs->blocksize; |
119 | inode.i_blocks += (fs->blocksize / 512) * es.newblocks; | 119 | inode.i_blocks += (fs->blocksize / 512) * es.newblocks; |
120 | 120 | ||