befs: endianness annotations
PATCH 8/16 befs: endianness annotations
Date: Sat, 24 Dec 2005 14:28:55 -0500
split the data structures that exist in host- and disk-endian variants, annotate the fields of disk-endian ones, propagate changes.
Signed-off-by Al Viro <[email protected]>
--- fs/befs/befs.h | 4 +- fs/befs/befs_fs_types.h | 107 +++++++++++++++++++++++++++++++---------------- fs/befs/btree.c | 28 ++++++------ fs/befs/datastream.c | 10 ++-- fs/befs/debug.c | 9 ++-- fs/befs/endian.h | 20 ++++----- 6 files changed, 106 insertions(+), 72 deletions(-)
fs/befs/befs.h +2 -2
@@ -94,7 +94,7 @@ void befs_debug(const struct super_blockvoid befs_dump_super_block (const struct super_block *sb,befs_super_block *);void befs_dump_inode (const struct super_block *sb,befs_inode *); -void befs_dump_index_entry (const struct super_block *sb,befs_btree_super *); +void befs_dump_index_entry (const struct super_block *sb,befs_disk_btree_super *);void befs_dump_index_node (const struct super_block *sb,befs_btree_nodehead *);/****************************/
@@ -136,7 +136,7 @@ blockno2iaddr(struct super_block *sb, bestatic inline unsigned int befs_iaddrs_per_block (struct super_block *sb) { -return BEFS_SB (sb)->block_size /sizeof (befs_inode_addr); +return BEFS_SB (sb)->block_size /sizeof (befs_disk_inode_addr); } static inline int
fs/befs/befs_fs_types.h +71 -36
175 lines not on this page · raw message
fs/befs/btree.c +14 -14
@@ -79,7 +79,7 @@ #include "datastream.h"* In memory structure of each btree node */ typedef struct { -befs_btree_nodehead head;/* head of node converted to cpu byteorder */ +befs_host_btree_nodehead head;/* head of node converted to cpu byteorder */ struct buffer_head *bh;befs_btree_nodehead *od_node;/* on disk node */ }befs_btree_node ;
@@ -101,9 +101,9 @@ static int befs_bt_read_node(struct supestatic int befs_leafnode (befs_btree_node * node); -static u16 *befs_bt_keylen_index (befs_btree_node * node); +static fs16 *befs_bt_keylen_index (befs_btree_node * node); -static befs_off_t *befs_bt_valarray (befs_btree_node * node); +static fs64 *befs_bt_valarray (befs_btree_node * node);static char *befs_bt_keydata (befs_btree_node * node);
@@ -135,7 +135,7 @@ befs_bt_read_super(struct super_block *s befs_btree_super * sup) {struct buffer_head *bh =NULL ; -befs_btree_super *od_sup =NULL ; +befs_disk_btree_super *od_sup =NULL ;befs_debug (sb,"---> befs_btree_read_super()" );
@@ -145,7 +145,7 @@ befs_bt_read_super(struct super_block *sbefs_error (sb,"Couldn't read index header." ); goto error; } - od_sup = (befs_btree_super *) bh->b_data; + od_sup = (befs_disk_btree_super *) bh->b_data;befs_dump_index_entry (sb, od_sup); sup->magic =fs32_to_cpu (sb, od_sup->magic);
@@ -341,7 +341,7 @@ befs_find_key(struct super_block *sb, beu16 keylen;int findkey_len;char *thiskey; -befs_off_t *valarray; +fs64 *valarray;befs_debug (sb,"---> befs_find_key() %s" , findkey);
@@ -421,7 +421,7 @@ befs_btree_read(struct super_block *sb,befs_btree_super bt_super;befs_off_t node_off =0 ;int cur_key; -befs_off_t *valarray; +fs64 *valarray;char *keystart;u16 keylen;int res;
@@ -571,7 +571,7 @@ befs_btree_seekleaf(struct super_block * this_node->head.overflow); *node_off = this_node->head.overflow; }else { -befs_off_t *valarray =befs_bt_valarray (this_node); +fs64 *valarray =befs_bt_valarray (this_node); *node_off =fs64_to_cpu (sb, valarray[0 ]); }if (befs_bt_read_node (sb, ds, this_node, *node_off) !=BEFS_OK ) {
@@ -621,7 +621,7 @@ befs_leafnode(befs_btree_node * node)* * Except that rounding up to 8 works, and rounding up to 4 doesn't. */ -static u16 * +static fs16 *befs_bt_keylen_index (befs_btree_node * node) {const int keylen_align =8 ;
@@ -632,7 +632,7 @@ befs_bt_keylen_index(befs_btree_node * nif (tmp) off += keylen_align - tmp; -return (u16 *) ((void *) node->od_node + off); +return (fs16 *) ((void *) node->od_node + off); }/**
@@ -642,13 +642,13 @@ befs_bt_keylen_index(befs_btree_node * n* Returns a pointer to the start of the value array * of the node pointed to by the node header */ -static befs_off_t * +static fs64 *befs_bt_valarray (befs_btree_node * node) {void *keylen_index_start = (void *)befs_bt_keylen_index (node); -size_t keylen_index_size = node->head.all_key_count *sizeof (u16); +size_t keylen_index_size = node->head.all_key_count *sizeof (fs16); -return (befs_off_t *) (keylen_index_start + keylen_index_size); +return (fs64 *) (keylen_index_start + keylen_index_size); }/**
@@ -680,7 +680,7 @@ befs_bt_get_key(struct super_block *sb, {int prev_key_end;char *keystart; -u16 *keylen_index; +fs16 *keylen_index;if (index <0 || index > node->head.all_key_count) { *keylen =0 ;
fs/befs/datastream.c +5 -5
@@ -311,7 +311,7 @@ befs_find_brun_indirect(struct super_blobefs_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_bloreturn 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_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_ 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_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 ;
fs/befs/debug.c +4 -5
@@ -230,21 +230,20 @@ befs_dump_small_data(const struct super_/* unused */ void -befs_dump_run (const struct super_block *sb,befs_block_run run) +befs_dump_run (const struct super_block *sb,befs_disk_block_run run) {#ifdef CONFIG_BEFS_DEBUG - run =fsrun_to_cpu (sb, run); +befs_block_run n =fsrun_to_cpu (sb, run); -befs_debug (sb,"[%u, %hu, %hu]" , - run.allocation_group, run.start, run.len); +befs_debug (sb,"[%u, %hu, %hu]" , n.allocation_group, n.start, n.len);#endif //CONFIG_BEFS_DEBUG }#endif /* 0 */ void -befs_dump_index_entry (const struct super_block *sb,befs_btree_super * super) +befs_dump_index_entry (const struct super_block *sb,befs_disk_btree_super * super) {#ifdef CONFIG_BEFS_DEBUG
fs/befs/endian.h +10 -10
@@ -68,26 +68,26 @@ cpu_to_fs16(const struct super_block *sb/* Composite types below here */ static inline befs_block_run -fsrun_to_cpu (const struct super_block *sb,befs_block_run n) +fsrun_to_cpu (const struct super_block *sb,befs_disk_block_run n) {befs_block_run run;if (BEFS_SB (sb)->byte_order ==BEFS_BYTESEX_LE ) { - run.allocation_group =le32_to_cpu (n.allocation_group); - run.start =le16_to_cpu (n.start); - run.len =le16_to_cpu (n.len); + run.allocation_group =le32_to_cpu ((__force __le32 )n.allocation_group); + run.start =le16_to_cpu ((__force __le16 )n.start); + run.len =le16_to_cpu ((__force __le16 )n.len); }else { - run.allocation_group =be32_to_cpu (n.allocation_group); - run.start =be16_to_cpu (n.start); - run.len =be16_to_cpu (n.len); + run.allocation_group =be32_to_cpu ((__force __be32 )n.allocation_group); + run.start =be16_to_cpu ((__force __be16 )n.start); + run.len =be16_to_cpu ((__force __be16 )n.len); }return run; } -static inline befs_block_run +static inline befs_disk_block_run cpu_to_fsrun (const struct super_block *sb,befs_block_run n) { -befs_block_run run; +befs_disk_block_run run;if (BEFS_SB (sb)->byte_order ==BEFS_BYTESEX_LE ) { run.allocation_group =cpu_to_le32 (n.allocation_group);
@@ -102,7 +102,7 @@ cpu_to_fsrun(const struct super_block *s }static inline befs_data_stream -fsds_to_cpu (const struct super_block *sb,befs_data_stream n) +fsds_to_cpu (const struct super_block *sb,befs_disk_data_stream n) {befs_data_stream data;int i;
Signature · 1 line
1.4.2.GIT