78
78
/*
79
79
* In memory structure of each btree node
80
80
*/
81
- typedef struct {
81
+ struct befs_btree_node {
82
82
befs_host_btree_nodehead head ; /* head of node converted to cpu byteorder */
83
83
struct buffer_head * bh ;
84
84
befs_btree_nodehead * od_node ; /* on disk node */
85
- } befs_btree_node ;
85
+ };
86
86
87
87
/* local constants */
88
88
static const befs_off_t befs_bt_inval = 0xffffffffffffffffULL ;
89
89
90
90
/* local functions */
91
91
static int befs_btree_seekleaf (struct super_block * sb , befs_data_stream * ds ,
92
92
befs_btree_super * bt_super ,
93
- befs_btree_node * this_node ,
93
+ struct befs_btree_node * this_node ,
94
94
befs_off_t * node_off );
95
95
96
96
static int befs_bt_read_super (struct super_block * sb , befs_data_stream * ds ,
97
97
befs_btree_super * sup );
98
98
99
99
static int befs_bt_read_node (struct super_block * sb , befs_data_stream * ds ,
100
- befs_btree_node * node , befs_off_t node_off );
100
+ struct befs_btree_node * node ,
101
+ befs_off_t node_off );
101
102
102
- static int befs_leafnode (befs_btree_node * node );
103
+ static int befs_leafnode (struct befs_btree_node * node );
103
104
104
- static fs16 * befs_bt_keylen_index (befs_btree_node * node );
105
+ static fs16 * befs_bt_keylen_index (struct befs_btree_node * node );
105
106
106
- static fs64 * befs_bt_valarray (befs_btree_node * node );
107
+ static fs64 * befs_bt_valarray (struct befs_btree_node * node );
107
108
108
- static char * befs_bt_keydata (befs_btree_node * node );
109
+ static char * befs_bt_keydata (struct befs_btree_node * node );
109
110
110
- static int befs_find_key (struct super_block * sb , befs_btree_node * node ,
111
+ static int befs_find_key (struct super_block * sb ,
112
+ struct befs_btree_node * node ,
111
113
const char * findkey , befs_off_t * value );
112
114
113
- static char * befs_bt_get_key (struct super_block * sb , befs_btree_node * node ,
115
+ static char * befs_bt_get_key (struct super_block * sb ,
116
+ struct befs_btree_node * node ,
114
117
int index , u16 * keylen );
115
118
116
119
static int befs_compare_strings (const void * key1 , int keylen1 ,
@@ -191,7 +194,7 @@ befs_bt_read_super(struct super_block *sb, befs_data_stream * ds,
191
194
192
195
static int
193
196
befs_bt_read_node (struct super_block * sb , befs_data_stream * ds ,
194
- befs_btree_node * node , befs_off_t node_off )
197
+ struct befs_btree_node * node , befs_off_t node_off )
195
198
{
196
199
uint off = 0 ;
197
200
247
250
befs_btree_find (struct super_block * sb , befs_data_stream * ds ,
248
251
const char * key , befs_off_t * value )
249
252
{
250
- befs_btree_node * this_node = NULL ;
253
+ struct befs_btree_node * this_node = NULL ;
251
254
befs_btree_super bt_super ;
252
255
befs_off_t node_off ;
253
256
int res ;
@@ -260,11 +263,11 @@ befs_btree_find(struct super_block *sb, befs_data_stream * ds,
260
263
goto error ;
261
264
}
262
265
263
- this_node = kmalloc (sizeof ( befs_btree_node ),
266
+ this_node = kmalloc (sizeof ( struct befs_btree_node ),
264
267
GFP_NOFS );
265
268
if (!this_node ) {
266
269
befs_error (sb , "befs_btree_find() failed to allocate %zu "
267
- "bytes of memory" , sizeof ( befs_btree_node ));
270
+ "bytes of memory" , sizeof ( struct befs_btree_node ));
268
271
goto error ;
269
272
}
270
273
@@ -333,7 +336,7 @@ befs_btree_find(struct super_block *sb, befs_data_stream * ds,
333
336
* Use binary search instead of a linear.
334
337
*/
335
338
static int
336
- befs_find_key (struct super_block * sb , befs_btree_node * node ,
339
+ befs_find_key (struct super_block * sb , struct befs_btree_node * node ,
337
340
const char * findkey , befs_off_t * value )
338
341
{
339
342
int first , last , mid ;
@@ -417,7 +420,7 @@ befs_btree_read(struct super_block *sb, befs_data_stream * ds,
417
420
loff_t key_no , size_t bufsize , char * keybuf , size_t * keysize ,
418
421
befs_off_t * value )
419
422
{
420
- befs_btree_node * this_node ;
423
+ struct befs_btree_node * this_node ;
421
424
befs_btree_super bt_super ;
422
425
befs_off_t node_off = 0 ;
423
426
int cur_key ;
@@ -436,9 +439,10 @@ befs_btree_read(struct super_block *sb, befs_data_stream * ds,
436
439
goto error ;
437
440
}
438
441
439
- if ((this_node = kmalloc (sizeof (befs_btree_node ), GFP_NOFS )) == NULL ) {
442
+ this_node = kmalloc (sizeof (struct befs_btree_node ), GFP_NOFS );
443
+ if (this_node == NULL ) {
440
444
befs_error (sb , "befs_btree_read() failed to allocate %zu "
441
- "bytes of memory" , sizeof ( befs_btree_node ));
445
+ "bytes of memory" , sizeof ( struct befs_btree_node ));
442
446
goto error ;
443
447
}
444
448
@@ -545,7 +549,8 @@ befs_btree_read(struct super_block *sb, befs_data_stream * ds,
545
549
*/
546
550
static int
547
551
befs_btree_seekleaf (struct super_block * sb , befs_data_stream * ds ,
548
- befs_btree_super * bt_super , befs_btree_node * this_node ,
552
+ befs_btree_super * bt_super ,
553
+ struct befs_btree_node * this_node ,
549
554
befs_off_t * node_off )
550
555
{
551
556
@@ -600,7 +605,7 @@ befs_btree_seekleaf(struct super_block *sb, befs_data_stream * ds,
600
605
* Return 1 if leaf, 0 if interior
601
606
*/
602
607
static int
603
- befs_leafnode (befs_btree_node * node )
608
+ befs_leafnode (struct befs_btree_node * node )
604
609
{
605
610
/* all interior nodes (and only interior nodes) have an overflow node */
606
611
if (node -> head .overflow == befs_bt_inval )
@@ -623,7 +628,7 @@ befs_leafnode(befs_btree_node * node)
623
628
* Except that rounding up to 8 works, and rounding up to 4 doesn't.
624
629
*/
625
630
static fs16 *
626
- befs_bt_keylen_index (befs_btree_node * node )
631
+ befs_bt_keylen_index (struct befs_btree_node * node )
627
632
{
628
633
const int keylen_align = 8 ;
629
634
unsigned long int off =
@@ -644,7 +649,7 @@ befs_bt_keylen_index(befs_btree_node * node)
644
649
* of the node pointed to by the node header
645
650
*/
646
651
static fs64 *
647
- befs_bt_valarray (befs_btree_node * node )
652
+ befs_bt_valarray (struct befs_btree_node * node )
648
653
{
649
654
void * keylen_index_start = (void * ) befs_bt_keylen_index (node );
650
655
size_t keylen_index_size = node -> head .all_key_count * sizeof (fs16 );
@@ -660,7 +665,7 @@ befs_bt_valarray(befs_btree_node * node)
660
665
* of the node pointed to by the node header
661
666
*/
662
667
static char *
663
- befs_bt_keydata (befs_btree_node * node )
668
+ befs_bt_keydata (struct befs_btree_node * node )
664
669
{
665
670
return (char * ) ((void * ) node -> od_node + sizeof (befs_btree_nodehead ));
666
671
}
@@ -676,7 +681,7 @@ befs_bt_keydata(befs_btree_node * node)
676
681
* Returns NULL on failure (bad input) and sets *@keylen = 0
677
682
*/
678
683
static char *
679
- befs_bt_get_key (struct super_block * sb , befs_btree_node * node ,
684
+ befs_bt_get_key (struct super_block * sb , struct befs_btree_node * node ,
680
685
int index , u16 * keylen )
681
686
{
682
687
int prev_key_end ;
0 commit comments