Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] ext3_fsblk_t: the rest of in-kernel filesystem blocks conversion

Browse source 
Convert the ext3 in-kernel filesystem blocks to ext3_fsblk_t.  Convert the
rest of all unsigned long type in-kernel filesystem blocks to ext3_fsblk_t,
and replace the printk format string respondingly.

Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Mingming Cao 2006-06-25 05:48:07 -07:00 committed by Linus Torvalds
parent 1c2bf374a4
commit 43d23f9039
8 changed files with 96 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
fs/ext3/balloc.c
View file

@ -168,8 +168,7 @@ goal_in_my_reservation(struct ext3_reserve_window *rsv, ext3_grpblk_t grp_goal,
{ {
ext3_fsblk_t group_first_block, group_last_block; ext3_fsblk_t group_first_block, group_last_block;
group_first_block = le32_to_cpu(EXT3_SB(sb)->s_es->s_first_data_block) + group_first_block = ext3_group_first_block_no(sb, group);
group * EXT3_BLOCKS_PER_GROUP(sb);
group_last_block = group_first_block + EXT3_BLOCKS_PER_GROUP(sb) - 1; group_last_block = group_first_block + EXT3_BLOCKS_PER_GROUP(sb) - 1;
if ((rsv->_rsv_start > group_last_block) || if ((rsv->_rsv_start > group_last_block) ||
@ -664,9 +663,7 @@ ext3_try_to_allocate(struct super_block *sb, handle_t *handle, int group,
/* we do allocation within the reservation window if we have a window */ /* we do allocation within the reservation window if we have a window */
if (my_rsv) { if (my_rsv) {
group_first_block = group_first_block = ext3_group_first_block_no(sb, group);
le32_to_cpu(EXT3_SB(sb)->s_es->s_first_data_block) +
group * EXT3_BLOCKS_PER_GROUP(sb);
if (my_rsv->_rsv_start >= group_first_block) if (my_rsv->_rsv_start >= group_first_block)
start = my_rsv->_rsv_start - group_first_block; start = my_rsv->_rsv_start - group_first_block;
else else
@ -900,8 +897,7 @@ static int alloc_new_reservation(struct ext3_reserve_window_node *my_rsv,
int ret; int ret;
spinlock_t *rsv_lock = &EXT3_SB(sb)->s_rsv_window_lock; spinlock_t *rsv_lock = &EXT3_SB(sb)->s_rsv_window_lock;
group_first_block = le32_to_cpu(EXT3_SB(sb)->s_es->s_first_data_block) + group_first_block = ext3_group_first_block_no(sb, group);
group * EXT3_BLOCKS_PER_GROUP(sb);
group_end_block = group_first_block + EXT3_BLOCKS_PER_GROUP(sb) - 1; group_end_block = group_first_block + EXT3_BLOCKS_PER_GROUP(sb) - 1;
if (grp_goal < 0) if (grp_goal < 0)
@ -1104,8 +1100,7 @@ ext3_try_to_allocate_with_rsv(struct super_block *sb, handle_t *handle,
* first block is a filesystem wide block number * first block is a filesystem wide block number
* first block is the block number of the first block in this group * first block is the block number of the first block in this group
*/ */
group_first_block = le32_to_cpu(EXT3_SB(sb)->s_es->s_first_data_block) + group_first_block = ext3_group_first_block_no(sb, group);
group * EXT3_BLOCKS_PER_GROUP(sb);
/* /*
* Basically we will allocate a new block from inode's reservation * Basically we will allocate a new block from inode's reservation
@ -1371,8 +1366,7 @@ ext3_fsblk_t ext3_new_blocks(handle_t *handle, struct inode *inode,
if (fatal) if (fatal)
goto out; goto out;
ret_block = grp_alloc_blk + group_no * EXT3_BLOCKS_PER_GROUP(sb) ret_block = grp_alloc_blk + ext3_group_first_block_no(sb, group_no);
+ le32_to_cpu(es->s_first_data_block);
if (in_range(le32_to_cpu(gdp->bg_block_bitmap), ret_block, num) || if (in_range(le32_to_cpu(gdp->bg_block_bitmap), ret_block, num) ||
in_range(le32_to_cpu(gdp->bg_inode_bitmap), ret_block, num) || in_range(le32_to_cpu(gdp->bg_inode_bitmap), ret_block, num) ||
@ -1478,15 +1472,16 @@ ext3_fsblk_t ext3_new_block(handle_t *handle, struct inode *inode,
return ext3_new_blocks(handle, inode, goal, &count, errp); return ext3_new_blocks(handle, inode, goal, &count, errp);
} }
unsigned long ext3_count_free_blocks(struct super_block *sb) ext3_fsblk_t ext3_count_free_blocks(struct super_block *sb)
{ {
unsigned long desc_count; ext3_fsblk_t desc_count;
struct ext3_group_desc *gdp; struct ext3_group_desc *gdp;
int i; int i;
unsigned long ngroups = EXT3_SB(sb)->s_groups_count; unsigned long ngroups = EXT3_SB(sb)->s_groups_count;
#ifdef EXT3FS_DEBUG #ifdef EXT3FS_DEBUG
struct ext3_super_block *es; struct ext3_super_block *es;
unsigned long bitmap_count, x; ext3_fsblk_t bitmap_count;
unsigned long x;
struct buffer_head *bitmap_bh = NULL; struct buffer_head *bitmap_bh = NULL;
es = EXT3_SB(sb)->s_es; es = EXT3_SB(sb)->s_es;
@ -1511,8 +1506,10 @@ unsigned long ext3_count_free_blocks(struct super_block *sb)
bitmap_count += x; bitmap_count += x;
} }
brelse(bitmap_bh); brelse(bitmap_bh);
printk("ext3_count_free_blocks: stored = %u, computed = %lu, %lu\n", printk("ext3_count_free_blocks: stored = "E3FSBLK
le32_to_cpu(es->s_free_blocks_count), desc_count, bitmap_count); ", computed = "E3FSBLK", "E3FSBLK"\n",
le32_to_cpu(es->s_free_blocks_count),
desc_count, bitmap_count);
return bitmap_count; return bitmap_count;
#else #else
desc_count = 0; desc_count = 0;

55
fs/ext3/inode.c
View file

@ -407,13 +407,13 @@ static Indirect *ext3_get_branch(struct inode *inode, int depth, int *offsets,
* *
* Caller must make sure that @ind is valid and will stay that way. * Caller must make sure that @ind is valid and will stay that way.
*/ */
static unsigned long ext3_find_near(struct inode *inode, Indirect *ind) static ext3_fsblk_t ext3_find_near(struct inode *inode, Indirect *ind)
{ {
struct ext3_inode_info *ei = EXT3_I(inode); struct ext3_inode_info *ei = EXT3_I(inode);
__le32 *start = ind->bh ? (__le32*) ind->bh->b_data : ei->i_data; __le32 *start = ind->bh ? (__le32*) ind->bh->b_data : ei->i_data;
__le32 *p; __le32 *p;
unsigned long bg_start; ext3_fsblk_t bg_start;
unsigned long colour; ext3_grpblk_t colour;
/* Try to find previous block */ /* Try to find previous block */
for (p = ind->p - 1; p >= start; p--) { for (p = ind->p - 1; p >= start; p--) {
@ -429,8 +429,7 @@ static unsigned long ext3_find_near(struct inode *inode, Indirect *ind)
* It is going to be referred to from the inode itself? OK, just put it * It is going to be referred to from the inode itself? OK, just put it
* into the same cylinder group then. * into the same cylinder group then.
*/ */
bg_start = (ei->i_block_group * EXT3_BLOCKS_PER_GROUP(inode->i_sb)) + bg_start = ext3_group_first_block_no(inode->i_sb, ei->i_block_group);
le32_to_cpu(EXT3_SB(inode->i_sb)->s_es->s_first_data_block);
colour = (current->pid % 16) * colour = (current->pid % 16) *
(EXT3_BLOCKS_PER_GROUP(inode->i_sb) / 16); (EXT3_BLOCKS_PER_GROUP(inode->i_sb) / 16);
return bg_start + colour; return bg_start + colour;
@ -448,7 +447,7 @@ static unsigned long ext3_find_near(struct inode *inode, Indirect *ind)
* stores it in *@goal and returns zero. * stores it in *@goal and returns zero.
*/ */
static unsigned long ext3_find_goal(struct inode *inode, long block, static ext3_fsblk_t ext3_find_goal(struct inode *inode, long block,
Indirect chain[4], Indirect *partial) Indirect chain[4], Indirect *partial)
{ {
struct ext3_block_alloc_info *block_i; struct ext3_block_alloc_info *block_i;
@ -516,13 +515,13 @@ static int ext3_blks_to_allocate(Indirect *branch, int k, unsigned long blks,
* direct blocks * direct blocks
*/ */
static int ext3_alloc_blocks(handle_t *handle, struct inode *inode, static int ext3_alloc_blocks(handle_t *handle, struct inode *inode,
unsigned long goal, int indirect_blks, int blks, ext3_fsblk_t goal, int indirect_blks, int blks,
unsigned long long new_blocks[4], int *err) ext3_fsblk_t new_blocks[4], int *err)
{ {
int target, i; int target, i;
unsigned long count = 0; unsigned long count = 0;
int index = 0; int index = 0;
unsigned long current_block = 0; ext3_fsblk_t current_block = 0;
int ret = 0; int ret = 0;
/* /*
@ -592,7 +591,7 @@ static int ext3_alloc_blocks(handle_t *handle, struct inode *inode,
* as described above and return 0. * as described above and return 0.
*/ */
static int ext3_alloc_branch(handle_t *handle, struct inode *inode, static int ext3_alloc_branch(handle_t *handle, struct inode *inode,
int indirect_blks, int *blks, unsigned long goal, int indirect_blks, int *blks, ext3_fsblk_t goal,
int *offsets, Indirect *branch) int *offsets, Indirect *branch)
{ {
int blocksize = inode->i_sb->s_blocksize; int blocksize = inode->i_sb->s_blocksize;
@ -600,8 +599,8 @@ static int ext3_alloc_branch(handle_t *handle, struct inode *inode,
int err = 0; int err = 0;
struct buffer_head *bh; struct buffer_head *bh;
int num; int num;
unsigned long long new_blocks[4]; ext3_fsblk_t new_blocks[4];
unsigned long long current_block; ext3_fsblk_t current_block;
num = ext3_alloc_blocks(handle, inode, goal, indirect_blks, num = ext3_alloc_blocks(handle, inode, goal, indirect_blks,
*blks, new_blocks, &err); *blks, new_blocks, &err);
@ -688,7 +687,7 @@ static int ext3_splice_branch(handle_t *handle, struct inode *inode,
int i; int i;
int err = 0; int err = 0;
struct ext3_block_alloc_info *block_i; struct ext3_block_alloc_info *block_i;
unsigned long current_block; ext3_fsblk_t current_block;
block_i = EXT3_I(inode)->i_block_alloc_info; block_i = EXT3_I(inode)->i_block_alloc_info;
/* /*
@ -795,13 +794,13 @@ int ext3_get_blocks_handle(handle_t *handle, struct inode *inode,
int offsets[4]; int offsets[4];
Indirect chain[4]; Indirect chain[4];
Indirect *partial; Indirect *partial;
unsigned long goal; ext3_fsblk_t goal;
int indirect_blks; int indirect_blks;
int blocks_to_boundary = 0; int blocks_to_boundary = 0;
int depth; int depth;
struct ext3_inode_info *ei = EXT3_I(inode); struct ext3_inode_info *ei = EXT3_I(inode);
int count = 0; int count = 0;
unsigned long first_block = 0; ext3_fsblk_t first_block = 0;
J_ASSERT(handle != NULL || create == 0); J_ASSERT(handle != NULL || create == 0);
@ -819,7 +818,7 @@ int ext3_get_blocks_handle(handle_t *handle, struct inode *inode,
count++; count++;
/*map more blocks*/ /*map more blocks*/
while (count < maxblocks && count <= blocks_to_boundary) { while (count < maxblocks && count <= blocks_to_boundary) {
unsigned long blk; ext3_fsblk_t blk;
if (!verify_chain(chain, partial)) { if (!verify_chain(chain, partial)) {
/* /*
@ -1759,7 +1758,7 @@ void ext3_set_aops(struct inode *inode)
static int ext3_block_truncate_page(handle_t *handle, struct page *page, static int ext3_block_truncate_page(handle_t *handle, struct page *page,
struct address_space *mapping, loff_t from) struct address_space *mapping, loff_t from)
{ {
unsigned long index = from >> PAGE_CACHE_SHIFT; ext3_fsblk_t index = from >> PAGE_CACHE_SHIFT;
unsigned offset = from & (PAGE_CACHE_SIZE-1); unsigned offset = from & (PAGE_CACHE_SIZE-1);
unsigned blocksize, iblock, length, pos; unsigned blocksize, iblock, length, pos;
struct inode *inode = mapping->host; struct inode *inode = mapping->host;
@ -1960,7 +1959,7 @@ static Indirect *ext3_find_shared(struct inode *inode, int depth,
* than `count' because there can be holes in there. * than `count' because there can be holes in there.
*/ */
static void ext3_clear_blocks(handle_t *handle, struct inode *inode, static void ext3_clear_blocks(handle_t *handle, struct inode *inode,
struct buffer_head *bh, unsigned long block_to_free, struct buffer_head *bh, ext3_fsblk_t block_to_free,
unsigned long count, __le32 *first, __le32 *last) unsigned long count, __le32 *first, __le32 *last)
{ {
__le32 *p; __le32 *p;
@ -2022,12 +2021,12 @@ static void ext3_free_data(handle_t *handle, struct inode *inode,
struct buffer_head *this_bh, struct buffer_head *this_bh,
__le32 *first, __le32 *last) __le32 *first, __le32 *last)
{ {
unsigned long block_to_free = 0; /* Starting block # of a run */ ext3_fsblk_t block_to_free = 0; /* Starting block # of a run */
unsigned long count = 0; /* Number of blocks in the run */ unsigned long count = 0; /* Number of blocks in the run */
__le32 *block_to_free_p = NULL; /* Pointer into inode/ind __le32 *block_to_free_p = NULL; /* Pointer into inode/ind
corresponding to corresponding to
block_to_free */ block_to_free */
unsigned long nr; /* Current block # */ ext3_fsblk_t nr; /* Current block # */
__le32 *p; /* Pointer into inode/ind __le32 *p; /* Pointer into inode/ind
for current block */ for current block */
int err; int err;
@ -2089,7 +2088,7 @@ static void ext3_free_branches(handle_t *handle, struct inode *inode,
struct buffer_head *parent_bh, struct buffer_head *parent_bh,
__le32 *first, __le32 *last, int depth) __le32 *first, __le32 *last, int depth)
{ {
unsigned long nr; ext3_fsblk_t nr;
__le32 *p; __le32 *p;
if (is_handle_aborted(handle)) if (is_handle_aborted(handle))
@ -2113,7 +2112,7 @@ static void ext3_free_branches(handle_t *handle, struct inode *inode,
*/ */
if (!bh) { if (!bh) {
ext3_error(inode->i_sb, "ext3_free_branches", ext3_error(inode->i_sb, "ext3_free_branches",
"Read failure, inode=%ld, block=%ld", "Read failure, inode=%ld, block="E3FSBLK,
inode->i_ino, nr); inode->i_ino, nr);
continue; continue;
} }
@ -2394,11 +2393,12 @@ void ext3_truncate(struct inode *inode)
ext3_journal_stop(handle); ext3_journal_stop(handle);
} }
static unsigned long ext3_get_inode_block(struct super_block *sb, static ext3_fsblk_t ext3_get_inode_block(struct super_block *sb,
unsigned long ino, struct ext3_iloc *iloc) unsigned long ino, struct ext3_iloc *iloc)
{ {
unsigned long desc, group_desc, block_group; unsigned long desc, group_desc, block_group;
unsigned long offset, block; unsigned long offset;
ext3_fsblk_t block;
struct buffer_head *bh; struct buffer_head *bh;
struct ext3_group_desc * gdp; struct ext3_group_desc * gdp;
@ -2448,7 +2448,7 @@ static unsigned long ext3_get_inode_block(struct super_block *sb,
static int __ext3_get_inode_loc(struct inode *inode, static int __ext3_get_inode_loc(struct inode *inode,
struct ext3_iloc *iloc, int in_mem) struct ext3_iloc *iloc, int in_mem)
{ {
unsigned long block; ext3_fsblk_t block;
struct buffer_head *bh; struct buffer_head *bh;
block = ext3_get_inode_block(inode->i_sb, inode->i_ino, iloc); block = ext3_get_inode_block(inode->i_sb, inode->i_ino, iloc);
@ -2459,7 +2459,8 @@ static int __ext3_get_inode_loc(struct inode *inode,
if (!bh) { if (!bh) {
ext3_error (inode->i_sb, "ext3_get_inode_loc", ext3_error (inode->i_sb, "ext3_get_inode_loc",
"unable to read inode block - " "unable to read inode block - "
"inode=%lu, block=%lu", inode->i_ino, block); "inode=%lu, block="E3FSBLK,
inode->i_ino, block);
return -EIO; return -EIO;
} }
if (!buffer_uptodate(bh)) { if (!buffer_uptodate(bh)) {
@ -2540,7 +2541,7 @@ static int __ext3_get_inode_loc(struct inode *inode,
if (!buffer_uptodate(bh)) { if (!buffer_uptodate(bh)) {
ext3_error(inode->i_sb, "ext3_get_inode_loc", ext3_error(inode->i_sb, "ext3_get_inode_loc",
"unable to read inode block - " "unable to read inode block - "
"inode=%lu, block=%lu", "inode=%lu, block="E3FSBLK,
inode->i_ino, block); inode->i_ino, block);
brelse(bh); brelse(bh);
return -EIO; return -EIO;

2
fs/ext3/ioctl.c
View file

@ -204,7 +204,7 @@ int ext3_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
return 0; return 0;
} }
case EXT3_IOC_GROUP_EXTEND: { case EXT3_IOC_GROUP_EXTEND: {
unsigned long n_blocks_count; ext3_fsblk_t n_blocks_count;
struct super_block *sb = inode->i_sb; struct super_block *sb = inode->i_sb;
int err; int err;

34
fs/ext3/resize.c
View file

@ -116,7 +116,7 @@ static int verify_group_input(struct super_block *sb,
} }
static struct buffer_head *bclean(handle_t *handle, struct super_block *sb, static struct buffer_head *bclean(handle_t *handle, struct super_block *sb,
unsigned long blk) ext3_fsblk_t blk)
{ {
struct buffer_head *bh; struct buffer_head *bh;
int err; int err;
@ -167,14 +167,13 @@ static int setup_new_group_blocks(struct super_block *sb,
struct ext3_new_group_data *input) struct ext3_new_group_data *input)
{ {
struct ext3_sb_info *sbi = EXT3_SB(sb); struct ext3_sb_info *sbi = EXT3_SB(sb);
unsigned long start = input->group * sbi->s_blocks_per_group + ext3_fsblk_t start = ext3_group_first_block_no(sb, input->group);
le32_to_cpu(sbi->s_es->s_first_data_block);
int reserved_gdb = ext3_bg_has_super(sb, input->group) ? int reserved_gdb = ext3_bg_has_super(sb, input->group) ?
le16_to_cpu(sbi->s_es->s_reserved_gdt_blocks) : 0; le16_to_cpu(sbi->s_es->s_reserved_gdt_blocks) : 0;
unsigned long gdblocks = ext3_bg_num_gdb(sb, input->group); unsigned long gdblocks = ext3_bg_num_gdb(sb, input->group);
struct buffer_head *bh; struct buffer_head *bh;
handle_t *handle; handle_t *handle;
unsigned long block; ext3_fsblk_t block;
ext3_grpblk_t bit; ext3_grpblk_t bit;
int i; int i;
int err = 0, err2; int err = 0, err2;
@ -332,7 +331,7 @@ static unsigned ext3_list_backups(struct super_block *sb, unsigned *three,
static int verify_reserved_gdb(struct super_block *sb, static int verify_reserved_gdb(struct super_block *sb,
struct buffer_head *primary) struct buffer_head *primary)
{ {
const unsigned long blk = primary->b_blocknr; const ext3_fsblk_t blk = primary->b_blocknr;
const unsigned long end = EXT3_SB(sb)->s_groups_count; const unsigned long end = EXT3_SB(sb)->s_groups_count;
unsigned three = 1; unsigned three = 1;
unsigned five = 5; unsigned five = 5;
@ -344,7 +343,8 @@ static int verify_reserved_gdb(struct super_block *sb,
while ((grp = ext3_list_backups(sb, &three, &five, &seven)) < end) { while ((grp = ext3_list_backups(sb, &three, &five, &seven)) < end) {
if (le32_to_cpu(*p++) != grp * EXT3_BLOCKS_PER_GROUP(sb) + blk){ if (le32_to_cpu(*p++) != grp * EXT3_BLOCKS_PER_GROUP(sb) + blk){
ext3_warning(sb, __FUNCTION__, ext3_warning(sb, __FUNCTION__,
"reserved GDT %lu missing grp %d (%lu)", "reserved GDT "E3FSBLK
" missing grp %d ("E3FSBLK")",
blk, grp, blk, grp,
grp * EXT3_BLOCKS_PER_GROUP(sb) + blk); grp * EXT3_BLOCKS_PER_GROUP(sb) + blk);
return -EINVAL; return -EINVAL;
@ -376,7 +376,7 @@ static int add_new_gdb(handle_t *handle, struct inode *inode,
struct super_block *sb = inode->i_sb; struct super_block *sb = inode->i_sb;
struct ext3_super_block *es = EXT3_SB(sb)->s_es; struct ext3_super_block *es = EXT3_SB(sb)->s_es;
unsigned long gdb_num = input->group / EXT3_DESC_PER_BLOCK(sb); unsigned long gdb_num = input->group / EXT3_DESC_PER_BLOCK(sb);
unsigned long gdblock = EXT3_SB(sb)->s_sbh->b_blocknr + 1 + gdb_num; ext3_fsblk_t gdblock = EXT3_SB(sb)->s_sbh->b_blocknr + 1 + gdb_num;
struct buffer_head **o_group_desc, **n_group_desc; struct buffer_head **o_group_desc, **n_group_desc;
struct buffer_head *dind; struct buffer_head *dind;
int gdbackups; int gdbackups;
@ -421,7 +421,7 @@ static int add_new_gdb(handle_t *handle, struct inode *inode,
data = (__u32 *)dind->b_data; data = (__u32 *)dind->b_data;
if (le32_to_cpu(data[gdb_num % EXT3_ADDR_PER_BLOCK(sb)]) != gdblock) { if (le32_to_cpu(data[gdb_num % EXT3_ADDR_PER_BLOCK(sb)]) != gdblock) {
ext3_warning(sb, __FUNCTION__, ext3_warning(sb, __FUNCTION__,
"new group %u GDT block %lu not reserved", "new group %u GDT block "E3FSBLK" not reserved",
input->group, gdblock); input->group, gdblock);
err = -EINVAL; err = -EINVAL;
goto exit_dind; goto exit_dind;
@ -519,7 +519,7 @@ static int reserve_backup_gdb(handle_t *handle, struct inode *inode,
struct buffer_head **primary; struct buffer_head **primary;
struct buffer_head *dind; struct buffer_head *dind;
struct ext3_iloc iloc; struct ext3_iloc iloc;
unsigned long blk; ext3_fsblk_t blk;
__u32 *data, *end; __u32 *data, *end;
int gdbackups = 0; int gdbackups = 0;
int res, i; int res, i;
@ -544,7 +544,8 @@ static int reserve_backup_gdb(handle_t *handle, struct inode *inode,
for (res = 0; res < reserved_gdb; res++, blk++) { for (res = 0; res < reserved_gdb; res++, blk++) {
if (le32_to_cpu(*data) != blk) { if (le32_to_cpu(*data) != blk) {
ext3_warning(sb, __FUNCTION__, ext3_warning(sb, __FUNCTION__,
"reserved block %lu not at offset %ld", "reserved block "E3FSBLK
" not at offset %ld",
blk, (long)(data - (__u32 *)dind->b_data)); blk, (long)(data - (__u32 *)dind->b_data));
err = -EINVAL; err = -EINVAL;
goto exit_bh; goto exit_bh;
@ -906,9 +907,9 @@ int ext3_group_add(struct super_block *sb, struct ext3_new_group_data *input)
* GDT blocks are reserved to grow to the desired size. * GDT blocks are reserved to grow to the desired size.
*/ */
int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es, int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es,
unsigned long n_blocks_count) ext3_fsblk_t n_blocks_count)
{ {
unsigned long o_blocks_count; ext3_fsblk_t o_blocks_count;
unsigned long o_groups_count; unsigned long o_groups_count;
ext3_grpblk_t last; ext3_grpblk_t last;
ext3_grpblk_t add; ext3_grpblk_t add;
@ -924,7 +925,7 @@ int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es,
o_groups_count = EXT3_SB(sb)->s_groups_count; o_groups_count = EXT3_SB(sb)->s_groups_count;
if (test_opt(sb, DEBUG)) if (test_opt(sb, DEBUG))
printk(KERN_DEBUG "EXT3-fs: extending last group from %lu to %lu blocks\n", printk(KERN_DEBUG "EXT3-fs: extending last group from "E3FSBLK" uto "E3FSBLK" blocks\n",
o_blocks_count, n_blocks_count); o_blocks_count, n_blocks_count);
if (n_blocks_count == 0 || n_blocks_count == o_blocks_count) if (n_blocks_count == 0 || n_blocks_count == o_blocks_count)
@ -963,7 +964,8 @@ int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es,
if (o_blocks_count + add < n_blocks_count) if (o_blocks_count + add < n_blocks_count)
ext3_warning(sb, __FUNCTION__, ext3_warning(sb, __FUNCTION__,
"will only finish group (%lu blocks, %u new)", "will only finish group ("E3FSBLK
" blocks, %u new)",
o_blocks_count + add, add); o_blocks_count + add, add);
/* See if the device is actually as big as what was requested */ /* See if the device is actually as big as what was requested */
@ -1006,10 +1008,10 @@ int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es,
ext3_journal_dirty_metadata(handle, EXT3_SB(sb)->s_sbh); ext3_journal_dirty_metadata(handle, EXT3_SB(sb)->s_sbh);
sb->s_dirt = 1; sb->s_dirt = 1;
unlock_super(sb); unlock_super(sb);
ext3_debug("freeing blocks %lu through %lu\n", o_blocks_count, ext3_debug("freeing blocks %lu through "E3FSBLK"\n", o_blocks_count,
o_blocks_count + add); o_blocks_count + add);
ext3_free_blocks_sb(handle, sb, o_blocks_count, add, &freed_blocks); ext3_free_blocks_sb(handle, sb, o_blocks_count, add, &freed_blocks);
ext3_debug("freed blocks %lu through %lu\n", o_blocks_count, ext3_debug("freed blocks "E3FSBLK" through "E3FSBLK"\n", o_blocks_count,
o_blocks_count + add); o_blocks_count + add);
if ((err = ext3_journal_stop(handle))) if ((err = ext3_journal_stop(handle)))
goto exit_put; goto exit_put;

32
fs/ext3/super.c
View file

@ -689,14 +689,15 @@ static match_table_t tokens = {
{Opt_resize, "resize"}, {Opt_resize, "resize"},
}; };
static unsigned long get_sb_block(void **data) static ext3_fsblk_t get_sb_block(void **data)
{ {
unsigned long sb_block; ext3_fsblk_t sb_block;
char *options = (char *) *data; char *options = (char *) *data;
if (!options || strncmp(options, "sb=", 3) != 0) if (!options || strncmp(options, "sb=", 3) != 0)
return 1; /* Default location */ return 1; /* Default location */
options += 3; options += 3;
/*todo: use simple_strtoll with >32bit ext3 */
sb_block = simple_strtoul(options, &options, 0); sb_block = simple_strtoul(options, &options, 0);
if (*options && *options != ',') { if (*options && *options != ',') {
printk("EXT3-fs: Invalid sb specification: %s\n", printk("EXT3-fs: Invalid sb specification: %s\n",
@ -711,7 +712,7 @@ static unsigned long get_sb_block(void **data)
static int parse_options (char *options, struct super_block *sb, static int parse_options (char *options, struct super_block *sb,
unsigned long *inum, unsigned long *journal_devnum, unsigned long *inum, unsigned long *journal_devnum,
unsigned long *n_blocks_count, int is_remount) ext3_fsblk_t *n_blocks_count, int is_remount)
{ {
struct ext3_sb_info *sbi = EXT3_SB(sb); struct ext3_sb_info *sbi = EXT3_SB(sb);
char * p; char * p;
@ -1128,7 +1129,7 @@ static int ext3_setup_super(struct super_block *sb, struct ext3_super_block *es,
static int ext3_check_descriptors (struct super_block * sb) static int ext3_check_descriptors (struct super_block * sb)
{ {
struct ext3_sb_info *sbi = EXT3_SB(sb); struct ext3_sb_info *sbi = EXT3_SB(sb);
unsigned long block = le32_to_cpu(sbi->s_es->s_first_data_block); ext3_fsblk_t block = le32_to_cpu(sbi->s_es->s_first_data_block);
struct ext3_group_desc * gdp = NULL; struct ext3_group_desc * gdp = NULL;
int desc_block = 0; int desc_block = 0;
int i; int i;
@ -1315,15 +1316,14 @@ static loff_t ext3_max_size(int bits)
return res; return res;
} }
static unsigned long descriptor_loc(struct super_block *sb, static ext3_fsblk_t descriptor_loc(struct super_block *sb,
unsigned long logic_sb_block, ext3_fsblk_t logic_sb_block,
int nr) int nr)
{ {
struct ext3_sb_info *sbi = EXT3_SB(sb); struct ext3_sb_info *sbi = EXT3_SB(sb);
unsigned long bg, first_data_block, first_meta_bg; unsigned long bg, first_meta_bg;
int has_super = 0; int has_super = 0;
first_data_block = le32_to_cpu(sbi->s_es->s_first_data_block);
first_meta_bg = le32_to_cpu(sbi->s_es->s_first_meta_bg); first_meta_bg = le32_to_cpu(sbi->s_es->s_first_meta_bg);
if (!EXT3_HAS_INCOMPAT_FEATURE(sb, EXT3_FEATURE_INCOMPAT_META_BG) || if (!EXT3_HAS_INCOMPAT_FEATURE(sb, EXT3_FEATURE_INCOMPAT_META_BG) ||
@ -1332,7 +1332,7 @@ static unsigned long descriptor_loc(struct super_block *sb,
bg = sbi->s_desc_per_block * nr; bg = sbi->s_desc_per_block * nr;
if (ext3_bg_has_super(sb, bg)) if (ext3_bg_has_super(sb, bg))
has_super = 1; has_super = 1;
return (first_data_block + has_super + (bg * sbi->s_blocks_per_group)); return (has_super + ext3_group_first_block_no(sb, bg));
} }
@ -1341,9 +1341,9 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
struct buffer_head * bh; struct buffer_head * bh;
struct ext3_super_block *es = NULL; struct ext3_super_block *es = NULL;
struct ext3_sb_info *sbi; struct ext3_sb_info *sbi;
unsigned long block; ext3_fsblk_t block;
unsigned long sb_block = get_sb_block(&data); ext3_fsblk_t sb_block = get_sb_block(&data);
unsigned long logic_sb_block; ext3_fsblk_t logic_sb_block;
unsigned long offset = 0; unsigned long offset = 0;
unsigned long journal_inum = 0; unsigned long journal_inum = 0;
unsigned long journal_devnum = 0; unsigned long journal_devnum = 0;
@ -1840,10 +1840,10 @@ static journal_t *ext3_get_dev_journal(struct super_block *sb,
{ {
struct buffer_head * bh; struct buffer_head * bh;
journal_t *journal; journal_t *journal;
int start; ext3_fsblk_t start;
ext3_fsblk_t len; ext3_fsblk_t len;
int hblock, blocksize; int hblock, blocksize;
unsigned long sb_block; ext3_fsblk_t sb_block;
unsigned long offset; unsigned long offset;
struct ext3_super_block * es; struct ext3_super_block * es;
struct block_device *bdev; struct block_device *bdev;
@ -2216,7 +2216,7 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data)
{ {
struct ext3_super_block * es; struct ext3_super_block * es;
struct ext3_sb_info *sbi = EXT3_SB(sb); struct ext3_sb_info *sbi = EXT3_SB(sb);
unsigned long n_blocks_count = 0; ext3_fsblk_t n_blocks_count = 0;
unsigned long old_sb_flags; unsigned long old_sb_flags;
struct ext3_mount_options old_opts; struct ext3_mount_options old_opts;
int err; int err;
@ -2336,7 +2336,7 @@ static int ext3_statfs (struct dentry * dentry, struct kstatfs * buf)
struct super_block *sb = dentry->d_sb; struct super_block *sb = dentry->d_sb;
struct ext3_sb_info *sbi = EXT3_SB(sb); struct ext3_sb_info *sbi = EXT3_SB(sb);
struct ext3_super_block *es = sbi->s_es; struct ext3_super_block *es = sbi->s_es;
unsigned long overhead; ext3_fsblk_t overhead;
int i; int i;
if (test_opt (sb, MINIX_DF)) if (test_opt (sb, MINIX_DF))

12
fs/ext3/xattr.c
View file

@ -233,7 +233,7 @@ ext3_xattr_block_get(struct inode *inode, int name_index, const char *name,
atomic_read(&(bh->b_count)), le32_to_cpu(BHDR(bh)->h_refcount)); atomic_read(&(bh->b_count)), le32_to_cpu(BHDR(bh)->h_refcount));
if (ext3_xattr_check_block(bh)) { if (ext3_xattr_check_block(bh)) {
bad_block: ext3_error(inode->i_sb, __FUNCTION__, bad_block: ext3_error(inode->i_sb, __FUNCTION__,
"inode %ld: bad block %u", inode->i_ino, "inode %ld: bad block "E3FSBLK, inode->i_ino,
EXT3_I(inode)->i_file_acl); EXT3_I(inode)->i_file_acl);
error = -EIO; error = -EIO;
goto cleanup; goto cleanup;
@ -375,7 +375,7 @@ ext3_xattr_block_list(struct inode *inode, char *buffer, size_t buffer_size)
atomic_read(&(bh->b_count)), le32_to_cpu(BHDR(bh)->h_refcount)); atomic_read(&(bh->b_count)), le32_to_cpu(BHDR(bh)->h_refcount));
if (ext3_xattr_check_block(bh)) { if (ext3_xattr_check_block(bh)) {
ext3_error(inode->i_sb, __FUNCTION__, ext3_error(inode->i_sb, __FUNCTION__,
"inode %ld: bad block %u", inode->i_ino, "inode %ld: bad block "E3FSBLK, inode->i_ino,
EXT3_I(inode)->i_file_acl); EXT3_I(inode)->i_file_acl);
error = -EIO; error = -EIO;
goto cleanup; goto cleanup;
@ -647,7 +647,7 @@ ext3_xattr_block_find(struct inode *inode, struct ext3_xattr_info *i,
le32_to_cpu(BHDR(bs->bh)->h_refcount)); le32_to_cpu(BHDR(bs->bh)->h_refcount));
if (ext3_xattr_check_block(bs->bh)) { if (ext3_xattr_check_block(bs->bh)) {
ext3_error(sb, __FUNCTION__, ext3_error(sb, __FUNCTION__,
"inode %ld: bad block %u", inode->i_ino, "inode %ld: bad block "E3FSBLK, inode->i_ino,
EXT3_I(inode)->i_file_acl); EXT3_I(inode)->i_file_acl);
error = -EIO; error = -EIO;
goto cleanup; goto cleanup;
@ -848,7 +848,7 @@ ext3_xattr_block_set(handle_t *handle, struct inode *inode,
bad_block: bad_block:
ext3_error(inode->i_sb, __FUNCTION__, ext3_error(inode->i_sb, __FUNCTION__,
"inode %ld: bad block %u", inode->i_ino, "inode %ld: bad block "E3FSBLK, inode->i_ino,
EXT3_I(inode)->i_file_acl); EXT3_I(inode)->i_file_acl);
goto cleanup; goto cleanup;
@ -1077,14 +1077,14 @@ ext3_xattr_delete_inode(handle_t *handle, struct inode *inode)
bh = sb_bread(inode->i_sb, EXT3_I(inode)->i_file_acl); bh = sb_bread(inode->i_sb, EXT3_I(inode)->i_file_acl);
if (!bh) { if (!bh) {
ext3_error(inode->i_sb, __FUNCTION__, ext3_error(inode->i_sb, __FUNCTION__,
"inode %ld: block %u read error", inode->i_ino, "inode %ld: block "E3FSBLK" read error", inode->i_ino,
EXT3_I(inode)->i_file_acl); EXT3_I(inode)->i_file_acl);
goto cleanup; goto cleanup;
} }
if (BHDR(bh)->h_magic != cpu_to_le32(EXT3_XATTR_MAGIC) || if (BHDR(bh)->h_magic != cpu_to_le32(EXT3_XATTR_MAGIC) ||
BHDR(bh)->h_blocks != cpu_to_le32(1)) { BHDR(bh)->h_blocks != cpu_to_le32(1)) {
ext3_error(inode->i_sb, __FUNCTION__, ext3_error(inode->i_sb, __FUNCTION__,
"inode %ld: bad block %u", inode->i_ino, "inode %ld: bad block "E3FSBLK, inode->i_ino,
EXT3_I(inode)->i_file_acl); EXT3_I(inode)->i_file_acl);
goto cleanup; goto cleanup;
} }

12
include/linux/ext3_fs.h
View file

@ -710,6 +710,14 @@ struct dir_private_info {
__u32 next_hash; __u32 next_hash;
}; };
/* calculate the first block number of the group */
static inline ext3_fsblk_t
ext3_group_first_block_no(struct super_block *sb, unsigned long group_no)
{
return group_no * (ext3_fsblk_t)EXT3_BLOCKS_PER_GROUP(sb) +
le32_to_cpu(EXT3_SB(sb)->s_es->s_first_data_block);
}
/* /*
* Special error return code only used by dx_probe() and its callers. * Special error return code only used by dx_probe() and its callers.
*/ */
@ -739,7 +747,7 @@ extern void ext3_free_blocks (handle_t *handle, struct inode *inode,
extern void ext3_free_blocks_sb (handle_t *handle, struct super_block *sb, extern void ext3_free_blocks_sb (handle_t *handle, struct super_block *sb,
ext3_fsblk_t block, unsigned long count, ext3_fsblk_t block, unsigned long count,
unsigned long *pdquot_freed_blocks); unsigned long *pdquot_freed_blocks);
extern unsigned long ext3_count_free_blocks (struct super_block *); extern ext3_fsblk_t ext3_count_free_blocks (struct super_block *);
extern void ext3_check_blocks_bitmap (struct super_block *); extern void ext3_check_blocks_bitmap (struct super_block *);
extern struct ext3_group_desc * ext3_get_group_desc(struct super_block * sb, extern struct ext3_group_desc * ext3_get_group_desc(struct super_block * sb,
unsigned int block_group, unsigned int block_group,
@ -811,7 +819,7 @@ extern int ext3_group_add(struct super_block *sb,
struct ext3_new_group_data *input); struct ext3_new_group_data *input);
extern int ext3_group_extend(struct super_block *sb, extern int ext3_group_extend(struct super_block *sb,
struct ext3_super_block *es, struct ext3_super_block *es,
unsigned long n_blocks_count); ext3_fsblk_t n_blocks_count);
/* super.c */ /* super.c */
extern void ext3_error (struct super_block *, const char *, const char *, ...) extern void ext3_error (struct super_block *, const char *, const char *, ...)

8
include/linux/ext3_fs_i.h
View file

@ -30,8 +30,8 @@ typedef unsigned long ext3_fsblk_t;
#define E3FSBLK "%lu" #define E3FSBLK "%lu"
struct ext3_reserve_window { struct ext3_reserve_window {
__u32 _rsv_start; /* First byte reserved */ ext3_fsblk_t _rsv_start; /* First byte reserved */
__u32 _rsv_end; /* Last byte reserved or 0 */ ext3_fsblk_t _rsv_end; /* Last byte reserved or 0 */
}; };
struct ext3_reserve_window_node { struct ext3_reserve_window_node {
@ -58,7 +58,7 @@ struct ext3_block_alloc_info {
* allocated to this file. This give us the goal (target) for the next * allocated to this file. This give us the goal (target) for the next
* allocation when we detect linearly ascending requests. * allocation when we detect linearly ascending requests.
*/ */
__u32 last_alloc_physical_block; ext3_fsblk_t last_alloc_physical_block;
}; };
#define rsv_start rsv_window._rsv_start #define rsv_start rsv_window._rsv_start
@ -75,7 +75,7 @@ struct ext3_inode_info {
__u8 i_frag_no; __u8 i_frag_no;
__u8 i_frag_size; __u8 i_frag_size;
#endif #endif
__u32 i_file_acl; ext3_fsblk_t i_file_acl;
__u32 i_dir_acl; __u32 i_dir_acl;
__u32 i_dtime; __u32 i_dtime;