redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

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 <himangi774@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
wifi-calibration
Himangi Saraogi 2014-10-13 15:53:18 -07:00 committed by Linus Torvalds
parent a882b14fe8
commit 0f2a84f41a
1 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
fs/befs/btree.c
View File

@ -78,11 +78,11 @@
/* /*
* In memory structure of each btree node * In memory structure of each btree node
*/ */
typedef struct { struct befs_btree_node {
befs_host_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; struct buffer_head *bh;
befs_btree_nodehead *od_node; /* on disk node */ befs_btree_nodehead *od_node; /* on disk node */
} befs_btree_node; };
/* local constants */ /* local constants */
static const befs_off_t befs_bt_inval = 0xffffffffffffffffULL; static const befs_off_t befs_bt_inval = 0xffffffffffffffffULL;
@ -90,27 +90,30 @@ static const befs_off_t befs_bt_inval = 0xffffffffffffffffULL;
/* local functions */ /* local functions */
static int befs_btree_seekleaf(struct super_block *sb, befs_data_stream * ds, static int befs_btree_seekleaf(struct super_block *sb, befs_data_stream * ds,
befs_btree_super * bt_super, befs_btree_super * bt_super,
befs_btree_node * this_node, struct befs_btree_node *this_node,
befs_off_t * node_off); befs_off_t * node_off);
static int befs_bt_read_super(struct super_block *sb, befs_data_stream * ds, static int befs_bt_read_super(struct super_block *sb, befs_data_stream * ds,
befs_btree_super * sup); befs_btree_super * sup);
static int befs_bt_read_node(struct super_block *sb, befs_data_stream * ds, static int befs_bt_read_node(struct super_block *sb, befs_data_stream * ds,
befs_btree_node * node, befs_off_t node_off); struct befs_btree_node *node,
befs_off_t node_off);
static int befs_leafnode(befs_btree_node * node); static int befs_leafnode(struct befs_btree_node *node);
static fs16 *befs_bt_keylen_index(befs_btree_node * node); static fs16 *befs_bt_keylen_index(struct befs_btree_node *node);
static fs64 *befs_bt_valarray(befs_btree_node * node); static fs64 *befs_bt_valarray(struct befs_btree_node *node);
static char *befs_bt_keydata(befs_btree_node * node); static char *befs_bt_keydata(struct befs_btree_node *node);
static int befs_find_key(struct super_block *sb, befs_btree_node * node, static int befs_find_key(struct super_block *sb,
struct befs_btree_node *node,
const char *findkey, befs_off_t * value); const char *findkey, befs_off_t * value);
static char *befs_bt_get_key(struct super_block *sb, befs_btree_node * node, static char *befs_bt_get_key(struct super_block *sb,
struct befs_btree_node *node,
int index, u16 * keylen); int index, u16 * keylen);
static int befs_compare_strings(const void *key1, int keylen1, 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,
static int static int
befs_bt_read_node(struct super_block *sb, befs_data_stream * ds, befs_bt_read_node(struct super_block *sb, befs_data_stream * ds,
befs_btree_node * node, befs_off_t node_off) struct befs_btree_node *node, befs_off_t node_off)
{ {
uint off = 0; uint off = 0;
@ -247,7 +250,7 @@ int
befs_btree_find(struct super_block *sb, befs_data_stream * ds, befs_btree_find(struct super_block *sb, befs_data_stream * ds,
const char *key, befs_off_t * value) const char *key, befs_off_t * value)
{ {
befs_btree_node *this_node = NULL; struct befs_btree_node *this_node = NULL;
befs_btree_super bt_super; befs_btree_super bt_super;
befs_off_t node_off; befs_off_t node_off;
int res; int res;
@ -260,11 +263,11 @@ befs_btree_find(struct super_block *sb, befs_data_stream * ds,
goto error; goto error;
} }
this_node = kmalloc(sizeof (befs_btree_node), this_node = kmalloc(sizeof(struct befs_btree_node),
GFP_NOFS); GFP_NOFS);
if (!this_node) { if (!this_node) {
befs_error(sb, "befs_btree_find() failed to allocate %zu " befs_error(sb, "befs_btree_find() failed to allocate %zu "
"bytes of memory", sizeof (befs_btree_node)); "bytes of memory", sizeof(struct befs_btree_node));
goto error; goto error;
} }
@ -333,7 +336,7 @@ befs_btree_find(struct super_block *sb, befs_data_stream * ds,
* Use binary search instead of a linear. * Use binary search instead of a linear.
*/ */
static int static int
befs_find_key(struct super_block *sb, befs_btree_node * node, befs_find_key(struct super_block *sb, struct befs_btree_node *node,
const char *findkey, befs_off_t * value) const char *findkey, befs_off_t * value)
{ {
int first, last, mid; int first, last, mid;
@ -417,7 +420,7 @@ befs_btree_read(struct super_block *sb, befs_data_stream * ds,
loff_t key_no, size_t bufsize, char *keybuf, size_t * keysize, loff_t key_no, size_t bufsize, char *keybuf, size_t * keysize,
befs_off_t * value) befs_off_t * value)
{ {
befs_btree_node *this_node; struct befs_btree_node *this_node;
befs_btree_super bt_super; befs_btree_super bt_super;
befs_off_t node_off = 0; befs_off_t node_off = 0;
int cur_key; int cur_key;
@ -436,9 +439,10 @@ befs_btree_read(struct super_block *sb, befs_data_stream * ds,
goto error; goto error;
} }
if ((this_node = kmalloc(sizeof (befs_btree_node), GFP_NOFS)) == NULL) { this_node = kmalloc(sizeof(struct befs_btree_node), GFP_NOFS);
if (this_node == NULL) {
befs_error(sb, "befs_btree_read() failed to allocate %zu " befs_error(sb, "befs_btree_read() failed to allocate %zu "
"bytes of memory", sizeof (befs_btree_node)); "bytes of memory", sizeof(struct befs_btree_node));
goto error; goto error;
} }
@ -545,7 +549,8 @@ befs_btree_read(struct super_block *sb, befs_data_stream * ds,
*/ */
static int static int
befs_btree_seekleaf(struct super_block *sb, befs_data_stream * ds, befs_btree_seekleaf(struct super_block *sb, befs_data_stream * ds,
befs_btree_super * bt_super, befs_btree_node * this_node, befs_btree_super *bt_super,
struct befs_btree_node *this_node,
befs_off_t * node_off) befs_off_t * node_off)
{ {
@ -600,7 +605,7 @@ befs_btree_seekleaf(struct super_block *sb, befs_data_stream * ds,
* Return 1 if leaf, 0 if interior * Return 1 if leaf, 0 if interior
*/ */
static int static int
befs_leafnode(befs_btree_node * node) befs_leafnode(struct befs_btree_node *node)
{ {
/* all interior nodes (and only interior nodes) have an overflow node */ /* all interior nodes (and only interior nodes) have an overflow node */
if (node->head.overflow == befs_bt_inval) if (node->head.overflow == befs_bt_inval)
@ -623,7 +628,7 @@ befs_leafnode(befs_btree_node * node)
* Except that rounding up to 8 works, and rounding up to 4 doesn't. * Except that rounding up to 8 works, and rounding up to 4 doesn't.
*/ */
static fs16 * static fs16 *
befs_bt_keylen_index(befs_btree_node * node) befs_bt_keylen_index(struct befs_btree_node *node)
{ {
const int keylen_align = 8; const int keylen_align = 8;
unsigned long int off = unsigned long int off =
@ -644,7 +649,7 @@ befs_bt_keylen_index(befs_btree_node * node)
* of the node pointed to by the node header * of the node pointed to by the node header
*/ */
static fs64 * static fs64 *
befs_bt_valarray(befs_btree_node * node) befs_bt_valarray(struct befs_btree_node *node)
{ {
void *keylen_index_start = (void *) befs_bt_keylen_index(node); void *keylen_index_start = (void *) befs_bt_keylen_index(node);
size_t keylen_index_size = node->head.all_key_count * sizeof (fs16); size_t keylen_index_size = node->head.all_key_count * sizeof (fs16);
@ -660,7 +665,7 @@ befs_bt_valarray(befs_btree_node * node)
* of the node pointed to by the node header * of the node pointed to by the node header
*/ */
static char * static char *
befs_bt_keydata(befs_btree_node * node) befs_bt_keydata(struct befs_btree_node *node)
{ {
return (char *) ((void *) node->od_node + sizeof (befs_btree_nodehead)); return (char *) ((void *) node->od_node + sizeof (befs_btree_nodehead));
} }
@ -676,7 +681,7 @@ befs_bt_keydata(befs_btree_node * node)
* Returns NULL on failure (bad input) and sets *@keylen = 0 * Returns NULL on failure (bad input) and sets *@keylen = 0
*/ */
static char * static char *
befs_bt_get_key(struct super_block *sb, befs_btree_node * node, befs_bt_get_key(struct super_block *sb, struct befs_btree_node *node,
int index, u16 * keylen) int index, u16 * keylen)
{ {
int prev_key_end; int prev_key_end;