Whamcloud - gitweb
git://git.whamcloud.com
/
tools
/
e2fsprogs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'maint' into next
[tools/e2fsprogs.git]
/
lib
/
ext2fs
/
bb_inode.c
diff --git
a/lib/ext2fs/bb_inode.c
b/lib/ext2fs/bb_inode.c
index
2626686
..
0b79b16
100644
(file)
--- a/
lib/ext2fs/bb_inode.c
+++ b/
lib/ext2fs/bb_inode.c
@@
-166,7
+166,7
@@
static int clear_bad_block_proc(ext2_filsys fs, blk_t *block_nr,
/*
* If the block number is outrageous, clear it and ignore it.
*/
/*
* If the block number is outrageous, clear it and ignore it.
*/
- if (*block_nr >=
fs->super->s_blocks_count
||
+ if (*block_nr >=
ext2fs_blocks_count(fs->super)
||
*block_nr < fs->super->s_first_data_block) {
*block_nr = 0;
return BLOCK_CHANGED;
*block_nr < fs->super->s_first_data_block) {
*block_nr = 0;
return BLOCK_CHANGED;
@@
-191,7
+191,7
@@
static int clear_bad_block_proc(ext2_filsys fs, blk_t *block_nr,
/*
* Mark the block as unused, and update accounting information
*/
/*
* Mark the block as unused, and update accounting information
*/
- ext2fs_block_alloc_stats(fs, *block_nr, -1);
+ ext2fs_block_alloc_stats
2
(fs, *block_nr, -1);
*block_nr = 0;
return BLOCK_CHANGED;
*block_nr = 0;
return BLOCK_CHANGED;
@@
-235,7
+235,7
@@
static int set_bad_block_proc(ext2_filsys fs, blk_t *block_nr,
retry:
if (rec->ind_blocks_ptr < rec->ind_blocks_size) {
blk = rec->ind_blocks[rec->ind_blocks_ptr++];
retry:
if (rec->ind_blocks_ptr < rec->ind_blocks_size) {
blk = rec->ind_blocks[rec->ind_blocks_ptr++];
- if (ext2fs_test_block_bitmap(fs->block_map, blk))
+ if (ext2fs_test_block_bitmap
2
(fs->block_map, blk))
goto retry;
} else {
retval = ext2fs_new_block(fs, 0, 0, &blk);
goto retry;
} else {
retval = ext2fs_new_block(fs, 0, 0, &blk);
@@
-244,7
+244,7
@@
static int set_bad_block_proc(ext2_filsys fs, blk_t *block_nr,
return BLOCK_ABORT;
}
}
return BLOCK_ABORT;
}
}
- retval = io_channel_write_blk(fs->io, blk, 1, rec->block_buf);
+ retval = io_channel_write_blk
64
(fs->io, blk, 1, rec->block_buf);
if (retval) {
rec->err = retval;
return BLOCK_ABORT;
if (retval) {
rec->err = retval;
return BLOCK_ABORT;
@@
-254,7
+254,7
@@
static int set_bad_block_proc(ext2_filsys fs, blk_t *block_nr,
/*
* Update block counts
*/
/*
* Update block counts
*/
- ext2fs_block_alloc_stats(fs, blk, +1);
+ ext2fs_block_alloc_stats
2
(fs, blk, +1);
*block_nr = blk;
return BLOCK_CHANGED;
*block_nr = blk;
return BLOCK_CHANGED;