Skip to content

Commit 0f2a84f

Browse files
himangi774torvalds
authored andcommitted
fs/befs/btree.c: remove typedef befs_btree_node
The Linux kernel coding style guidelines suggest not using typedefs for structure types. This patch gets rid of the typedef for befs_btree_node. The following Coccinelle semantic patch detects the case. @tn1@ type td; @@ typedef struct { ... } td; @script:python tf@ td << tn1.td; tdres; @@ coccinelle.tdres = td; @@ type tn1.td; identifier tf.tdres; @@ -typedef struct + tdres { ... } -td ; @@ type tn1.td; identifier tf.tdres; @@ -td + struct tdres Signed-off-by: Himangi Saraogi <[email protected]> Acked-by: Julia Lawall <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent a882b14 commit 0f2a84f

File tree

1 file changed

+29
-24
lines changed

1 file changed

+29
-24
lines changed

fs/befs/btree.c

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -78,39 +78,42 @@
7878
/*
7979
* In memory structure of each btree node
8080
*/
81-
typedef struct {
81+
struct befs_btree_node {
8282
befs_host_btree_nodehead head; /* head of node converted to cpu byteorder */
8383
struct buffer_head *bh;
8484
befs_btree_nodehead *od_node; /* on disk node */
85-
} befs_btree_node;
85+
};
8686

8787
/* local constants */
8888
static const befs_off_t befs_bt_inval = 0xffffffffffffffffULL;
8989

9090
/* local functions */
9191
static int befs_btree_seekleaf(struct super_block *sb, befs_data_stream * ds,
9292
befs_btree_super * bt_super,
93-
befs_btree_node * this_node,
93+
struct befs_btree_node *this_node,
9494
befs_off_t * node_off);
9595

9696
static int befs_bt_read_super(struct super_block *sb, befs_data_stream * ds,
9797
befs_btree_super * sup);
9898

9999
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);
101102

102-
static int befs_leafnode(befs_btree_node * node);
103+
static int befs_leafnode(struct befs_btree_node *node);
103104

104-
static fs16 *befs_bt_keylen_index(befs_btree_node * node);
105+
static fs16 *befs_bt_keylen_index(struct befs_btree_node *node);
105106

106-
static fs64 *befs_bt_valarray(befs_btree_node * node);
107+
static fs64 *befs_bt_valarray(struct befs_btree_node *node);
107108

108-
static char *befs_bt_keydata(befs_btree_node * node);
109+
static char *befs_bt_keydata(struct befs_btree_node *node);
109110

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,
111113
const char *findkey, befs_off_t * value);
112114

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,
114117
int index, u16 * keylen);
115118

116119
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,
191194

192195
static int
193196
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)
195198
{
196199
uint off = 0;
197200

@@ -247,7 +250,7 @@ int
247250
befs_btree_find(struct super_block *sb, befs_data_stream * ds,
248251
const char *key, befs_off_t * value)
249252
{
250-
befs_btree_node *this_node = NULL;
253+
struct befs_btree_node *this_node = NULL;
251254
befs_btree_super bt_super;
252255
befs_off_t node_off;
253256
int res;
@@ -260,11 +263,11 @@ befs_btree_find(struct super_block *sb, befs_data_stream * ds,
260263
goto error;
261264
}
262265

263-
this_node = kmalloc(sizeof (befs_btree_node),
266+
this_node = kmalloc(sizeof(struct befs_btree_node),
264267
GFP_NOFS);
265268
if (!this_node) {
266269
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));
268271
goto error;
269272
}
270273

@@ -333,7 +336,7 @@ befs_btree_find(struct super_block *sb, befs_data_stream * ds,
333336
* Use binary search instead of a linear.
334337
*/
335338
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,
337340
const char *findkey, befs_off_t * value)
338341
{
339342
int first, last, mid;
@@ -417,7 +420,7 @@ befs_btree_read(struct super_block *sb, befs_data_stream * ds,
417420
loff_t key_no, size_t bufsize, char *keybuf, size_t * keysize,
418421
befs_off_t * value)
419422
{
420-
befs_btree_node *this_node;
423+
struct befs_btree_node *this_node;
421424
befs_btree_super bt_super;
422425
befs_off_t node_off = 0;
423426
int cur_key;
@@ -436,9 +439,10 @@ befs_btree_read(struct super_block *sb, befs_data_stream * ds,
436439
goto error;
437440
}
438441

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) {
440444
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));
442446
goto error;
443447
}
444448

@@ -545,7 +549,8 @@ befs_btree_read(struct super_block *sb, befs_data_stream * ds,
545549
*/
546550
static int
547551
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,
549554
befs_off_t * node_off)
550555
{
551556

@@ -600,7 +605,7 @@ befs_btree_seekleaf(struct super_block *sb, befs_data_stream * ds,
600605
* Return 1 if leaf, 0 if interior
601606
*/
602607
static int
603-
befs_leafnode(befs_btree_node * node)
608+
befs_leafnode(struct befs_btree_node *node)
604609
{
605610
/* all interior nodes (and only interior nodes) have an overflow node */
606611
if (node->head.overflow == befs_bt_inval)
@@ -623,7 +628,7 @@ befs_leafnode(befs_btree_node * node)
623628
* Except that rounding up to 8 works, and rounding up to 4 doesn't.
624629
*/
625630
static fs16 *
626-
befs_bt_keylen_index(befs_btree_node * node)
631+
befs_bt_keylen_index(struct befs_btree_node *node)
627632
{
628633
const int keylen_align = 8;
629634
unsigned long int off =
@@ -644,7 +649,7 @@ befs_bt_keylen_index(befs_btree_node * node)
644649
* of the node pointed to by the node header
645650
*/
646651
static fs64 *
647-
befs_bt_valarray(befs_btree_node * node)
652+
befs_bt_valarray(struct befs_btree_node *node)
648653
{
649654
void *keylen_index_start = (void *) befs_bt_keylen_index(node);
650655
size_t keylen_index_size = node->head.all_key_count * sizeof (fs16);
@@ -660,7 +665,7 @@ befs_bt_valarray(befs_btree_node * node)
660665
* of the node pointed to by the node header
661666
*/
662667
static char *
663-
befs_bt_keydata(befs_btree_node * node)
668+
befs_bt_keydata(struct befs_btree_node *node)
664669
{
665670
return (char *) ((void *) node->od_node + sizeof (befs_btree_nodehead));
666671
}
@@ -676,7 +681,7 @@ befs_bt_keydata(befs_btree_node * node)
676681
* Returns NULL on failure (bad input) and sets *@keylen = 0
677682
*/
678683
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,
680685
int index, u16 * keylen)
681686
{
682687
int prev_key_end;

0 commit comments

Comments
 (0)