diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2009-08-01 20:43:00 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2009-08-01 20:43:00 -0400 |
| commit | baa8dbeb4e4acef9563d8aac61c01ec7c3a8c8ea (patch) | |
| tree | 0f3ac48582a739a0c089078635d8a9b363c01937 /lib | |
| parent | 4f1d0e8608ddf488316dffbe4cd9993bf3b22084 (diff) | |
| parent | bf3941aac389f1de6ce2008f818b6350d1fdd764 (diff) | |
| download | e2fsprogs-baa8dbeb4e4acef9563d8aac61c01ec7c3a8c8ea.tar.gz | |
Merge branch 'maint' into next
Conflicts:
misc/Makefile.in
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ext2fs/alloc_tables.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ext2fs/alloc_tables.c b/lib/ext2fs/alloc_tables.c index 9b4c0572..8547ad6e 100644 --- a/lib/ext2fs/alloc_tables.c +++ b/lib/ext2fs/alloc_tables.c @@ -178,7 +178,7 @@ errcode_t ext2fs_allocate_group_table(ext2_filsys fs, dgrp_t group, * Allocate the inode table */ if (flexbg_size) { - int prev_block = 0; + blk_t prev_block = 0; if (group && fs->group_desc[group-1].bg_inode_table) prev_block = fs->group_desc[group-1].bg_inode_table; group_blk = flexbg_offset(fs, group, prev_block, bmap, |