diff options
Diffstat (limited to 'fs/befs/datastream.c')
-rw-r--r-- | fs/befs/datastream.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/fs/befs/datastream.c b/fs/befs/datastream.c index b7d6b920f65f..aacb4da6298a 100644 --- a/fs/befs/datastream.c +++ b/fs/befs/datastream.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include "befs.h" | 18 | #include "befs.h" |
19 | #include "datastream.h" | 19 | #include "datastream.h" |
20 | #include "io.h" | 20 | #include "io.h" |
21 | #include "endian.h" | ||
22 | 21 | ||
23 | const befs_inode_addr BAD_IADDR = { 0, 0, 0 }; | 22 | const befs_inode_addr BAD_IADDR = { 0, 0, 0 }; |
24 | 23 | ||
@@ -312,7 +311,7 @@ befs_find_brun_indirect(struct super_block *sb, | |||
312 | befs_blocknr_t indir_start_blk; | 311 | befs_blocknr_t indir_start_blk; |
313 | befs_blocknr_t search_blk; | 312 | befs_blocknr_t search_blk; |
314 | struct buffer_head *indirblock; | 313 | struct buffer_head *indirblock; |
315 | befs_block_run *array; | 314 | befs_disk_block_run *array; |
316 | 315 | ||
317 | befs_block_run indirect = data->indirect; | 316 | befs_block_run indirect = data->indirect; |
318 | befs_blocknr_t indirblockno = iaddr2blockno(sb, &indirect); | 317 | befs_blocknr_t indirblockno = iaddr2blockno(sb, &indirect); |
@@ -334,7 +333,7 @@ befs_find_brun_indirect(struct super_block *sb, | |||
334 | return BEFS_ERR; | 333 | return BEFS_ERR; |
335 | } | 334 | } |
336 | 335 | ||
337 | array = (befs_block_run *) indirblock->b_data; | 336 | array = (befs_disk_block_run *) indirblock->b_data; |
338 | 337 | ||
339 | for (j = 0; j < arraylen; ++j) { | 338 | for (j = 0; j < arraylen; ++j) { |
340 | int len = fs16_to_cpu(sb, array[j].len); | 339 | int len = fs16_to_cpu(sb, array[j].len); |
@@ -427,7 +426,7 @@ befs_find_brun_dblindirect(struct super_block *sb, | |||
427 | struct buffer_head *dbl_indir_block; | 426 | struct buffer_head *dbl_indir_block; |
428 | struct buffer_head *indir_block; | 427 | struct buffer_head *indir_block; |
429 | befs_block_run indir_run; | 428 | befs_block_run indir_run; |
430 | befs_inode_addr *iaddr_array = NULL; | 429 | befs_disk_inode_addr *iaddr_array = NULL; |
431 | befs_sb_info *befs_sb = BEFS_SB(sb); | 430 | befs_sb_info *befs_sb = BEFS_SB(sb); |
432 | 431 | ||
433 | befs_blocknr_t indir_start_blk = | 432 | befs_blocknr_t indir_start_blk = |
@@ -482,7 +481,7 @@ befs_find_brun_dblindirect(struct super_block *sb, | |||
482 | 481 | ||
483 | dbl_block_indx = | 482 | dbl_block_indx = |
484 | dblindir_indx - (dbl_which_block * befs_iaddrs_per_block(sb)); | 483 | dblindir_indx - (dbl_which_block * befs_iaddrs_per_block(sb)); |
485 | iaddr_array = (befs_inode_addr *) dbl_indir_block->b_data; | 484 | iaddr_array = (befs_disk_inode_addr *) dbl_indir_block->b_data; |
486 | indir_run = fsrun_to_cpu(sb, iaddr_array[dbl_block_indx]); | 485 | indir_run = fsrun_to_cpu(sb, iaddr_array[dbl_block_indx]); |
487 | brelse(dbl_indir_block); | 486 | brelse(dbl_indir_block); |
488 | iaddr_array = NULL; | 487 | iaddr_array = NULL; |
@@ -507,7 +506,7 @@ befs_find_brun_dblindirect(struct super_block *sb, | |||
507 | } | 506 | } |
508 | 507 | ||
509 | block_indx = indir_indx - (which_block * befs_iaddrs_per_block(sb)); | 508 | block_indx = indir_indx - (which_block * befs_iaddrs_per_block(sb)); |
510 | iaddr_array = (befs_inode_addr *) indir_block->b_data; | 509 | iaddr_array = (befs_disk_inode_addr *) indir_block->b_data; |
511 | *run = fsrun_to_cpu(sb, iaddr_array[block_indx]); | 510 | *run = fsrun_to_cpu(sb, iaddr_array[block_indx]); |
512 | brelse(indir_block); | 511 | brelse(indir_block); |
513 | iaddr_array = NULL; | 512 | iaddr_array = NULL; |