fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/fs/befs/datastream.c b/fs/befs/datastream.c
index 785f6b2..aacb4da 100644 (file)
--- a/fs/befs/datastream.c
+++ b/fs/befs/datastream.c
@@ -18,7 +18,6 @@
 #include "befs.h"
 #include "datastream.h"
 #include "io.h"
-#include "endian.h"
 
 const befs_inode_addr BAD_IADDR = { 0, 0, 0 };
 
@@ -118,7 +117,7 @@ befs_fblock2brun(struct super_block *sb, befs_data_stream * data,
  * befs_read_lsmylink - read long symlink from datastream.
  * @sb: Filesystem superblock 
  * @ds: Datastrem to read from
- * @buf: Buffer in wich to place long symlink data
+ * @buf: Buffer in which to place long symlink data
  * @len: Length of the long symlink in bytes
  *
  * Returns the number of bytes read
@@ -312,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);
@@ -334,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);
@@ -427,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 =
@@ -482,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;
@@ -507,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;