Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-2.6] / fs / befs / datastream.c

diff --git a/fs/befs/datastream.c b/fs/befs/datastream.c
index 67335e2853f6b5c4095a8ef1b5d70300168da512..e3287d0d1a58815020044ef9f47383eec92cddcb 100644 (file)
--- a/fs/befs/datastream.c
+++ b/fs/befs/datastream.c
@@ -236,7 +236,7 @@ befs_count_blocks(struct super_block * sb, befs_data_stream * ds)
        as in the indirect region code).
        
        When/if blockno is found, if blockno is inside of a block 
-       run as stored on disk, we offset the start and lenght members 
+       run as stored on disk, we offset the start and length members
        of the block run, so that blockno is the start and len is
        still valid (the run ends in the same place).
        
@@ -311,7 +311,7 @@ befs_find_brun_indirect(struct super_block *sb,
        befs_blocknr_t indir_start_blk;
        befs_blocknr_t search_blk;
        struct buffer_head *indirblock;
-       befs_block_run *array;
+       befs_disk_block_run *array;
 
        befs_block_run indirect = data->indirect;
        befs_blocknr_t indirblockno = iaddr2blockno(sb, &indirect);
@@ -333,7 +333,7 @@ befs_find_brun_indirect(struct super_block *sb,
                        return BEFS_ERR;
                }
 
-               array = (befs_block_run *) indirblock->b_data;
+               array = (befs_disk_block_run *) indirblock->b_data;
 
                for (j = 0; j < arraylen; ++j) {
                        int len = fs16_to_cpu(sb, array[j].len);
@@ -426,7 +426,7 @@ befs_find_brun_dblindirect(struct super_block *sb,
        struct buffer_head *dbl_indir_block;
        struct buffer_head *indir_block;
        befs_block_run indir_run;
-       befs_inode_addr *iaddr_array = NULL;
+       befs_disk_inode_addr *iaddr_array = NULL;
        befs_sb_info *befs_sb = BEFS_SB(sb);
 
        befs_blocknr_t indir_start_blk =
@@ -481,7 +481,7 @@ befs_find_brun_dblindirect(struct super_block *sb,
 
        dbl_block_indx =
            dblindir_indx - (dbl_which_block * befs_iaddrs_per_block(sb));
-       iaddr_array = (befs_inode_addr *) dbl_indir_block->b_data;
+       iaddr_array = (befs_disk_inode_addr *) dbl_indir_block->b_data;
        indir_run = fsrun_to_cpu(sb, iaddr_array[dbl_block_indx]);
        brelse(dbl_indir_block);
        iaddr_array = NULL;
@@ -506,7 +506,7 @@ befs_find_brun_dblindirect(struct super_block *sb,
        }
 
        block_indx = indir_indx - (which_block * befs_iaddrs_per_block(sb));
-       iaddr_array = (befs_inode_addr *) indir_block->b_data;
+       iaddr_array = (befs_disk_inode_addr *) indir_block->b_data;
        *run = fsrun_to_cpu(sb, iaddr_array[block_indx]);
        brelse(indir_block);
        iaddr_array = NULL;