diff options
author | Fabian Frederick <fabf@skynet.be> | 2015-04-16 15:46:20 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-17 09:04:03 -0400 |
commit | 038428fcf7f05e5da46de617831a8230e1a2551d (patch) | |
tree | 5407218f36088da19b62a69de5a5979dc9807cad | |
parent | 09ad0eae5ed0f354df892b1cfb868338dc578c5c (diff) |
befs: replace typedef befs_sb_info by structure
See Documenation/CodingStyle
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | fs/befs/befs.h | 9 | ||||
-rw-r--r-- | fs/befs/datastream.c | 4 | ||||
-rw-r--r-- | fs/befs/io.c | 2 | ||||
-rw-r--r-- | fs/befs/linuxvfs.c | 5 | ||||
-rw-r--r-- | fs/befs/super.c | 4 |
5 files changed, 11 insertions, 13 deletions
diff --git a/fs/befs/befs.h b/fs/befs/befs.h index d4751affb222..11461abfda11 100644 --- a/fs/befs/befs.h +++ b/fs/befs/befs.h | |||
@@ -28,7 +28,7 @@ struct befs_mount_options { | |||
28 | char *iocharset; | 28 | char *iocharset; |
29 | }; | 29 | }; |
30 | 30 | ||
31 | typedef struct befs_sb_info { | 31 | struct befs_sb_info { |
32 | u32 magic1; | 32 | u32 magic1; |
33 | u32 block_size; | 33 | u32 block_size; |
34 | u32 block_shift; | 34 | u32 block_shift; |
@@ -54,8 +54,7 @@ typedef struct befs_sb_info { | |||
54 | 54 | ||
55 | struct befs_mount_options mount_opts; | 55 | struct befs_mount_options mount_opts; |
56 | struct nls_table *nls; | 56 | struct nls_table *nls; |
57 | 57 | }; | |
58 | } befs_sb_info; | ||
59 | 58 | ||
60 | typedef struct befs_inode_info { | 59 | typedef struct befs_inode_info { |
61 | u32 i_flags; | 60 | u32 i_flags; |
@@ -105,10 +104,10 @@ void befs_dump_index_node(const struct super_block *sb, befs_btree_nodehead *); | |||
105 | /* Gets a pointer to the private portion of the super_block | 104 | /* Gets a pointer to the private portion of the super_block |
106 | * structure from the public part | 105 | * structure from the public part |
107 | */ | 106 | */ |
108 | static inline befs_sb_info * | 107 | static inline struct befs_sb_info * |
109 | BEFS_SB(const struct super_block *super) | 108 | BEFS_SB(const struct super_block *super) |
110 | { | 109 | { |
111 | return (befs_sb_info *) super->s_fs_info; | 110 | return (struct befs_sb_info *) super->s_fs_info; |
112 | } | 111 | } |
113 | 112 | ||
114 | static inline befs_inode_info * | 113 | static inline befs_inode_info * |
diff --git a/fs/befs/datastream.c b/fs/befs/datastream.c index 1e8e0b8d8836..ebd50718659f 100644 --- a/fs/befs/datastream.c +++ b/fs/befs/datastream.c | |||
@@ -168,7 +168,7 @@ befs_count_blocks(struct super_block * sb, befs_data_stream * ds) | |||
168 | befs_blocknr_t blocks; | 168 | befs_blocknr_t blocks; |
169 | befs_blocknr_t datablocks; /* File data blocks */ | 169 | befs_blocknr_t datablocks; /* File data blocks */ |
170 | befs_blocknr_t metablocks; /* FS metadata blocks */ | 170 | befs_blocknr_t metablocks; /* FS metadata blocks */ |
171 | befs_sb_info *befs_sb = BEFS_SB(sb); | 171 | struct befs_sb_info *befs_sb = BEFS_SB(sb); |
172 | 172 | ||
173 | befs_debug(sb, "---> %s", __func__); | 173 | befs_debug(sb, "---> %s", __func__); |
174 | 174 | ||
@@ -428,7 +428,7 @@ befs_find_brun_dblindirect(struct super_block *sb, | |||
428 | struct buffer_head *indir_block; | 428 | struct buffer_head *indir_block; |
429 | befs_block_run indir_run; | 429 | befs_block_run indir_run; |
430 | befs_disk_inode_addr *iaddr_array = NULL; | 430 | befs_disk_inode_addr *iaddr_array = NULL; |
431 | befs_sb_info *befs_sb = BEFS_SB(sb); | 431 | struct befs_sb_info *befs_sb = BEFS_SB(sb); |
432 | 432 | ||
433 | befs_blocknr_t indir_start_blk = | 433 | befs_blocknr_t indir_start_blk = |
434 | data->max_indirect_range >> befs_sb->block_shift; | 434 | data->max_indirect_range >> befs_sb->block_shift; |
diff --git a/fs/befs/io.c b/fs/befs/io.c index 0408a3d601d0..7a5b4ec21c56 100644 --- a/fs/befs/io.c +++ b/fs/befs/io.c | |||
@@ -28,7 +28,7 @@ befs_bread_iaddr(struct super_block *sb, befs_inode_addr iaddr) | |||
28 | { | 28 | { |
29 | struct buffer_head *bh = NULL; | 29 | struct buffer_head *bh = NULL; |
30 | befs_blocknr_t block = 0; | 30 | befs_blocknr_t block = 0; |
31 | befs_sb_info *befs_sb = BEFS_SB(sb); | 31 | struct befs_sb_info *befs_sb = BEFS_SB(sb); |
32 | 32 | ||
33 | befs_debug(sb, "---> Enter %s " | 33 | befs_debug(sb, "---> Enter %s " |
34 | "[%u, %hu, %hu]", __func__, iaddr.allocation_group, | 34 | "[%u, %hu, %hu]", __func__, iaddr.allocation_group, |
diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c index 126fb6ce9899..9978db4aeb87 100644 --- a/fs/befs/linuxvfs.c +++ b/fs/befs/linuxvfs.c | |||
@@ -304,8 +304,7 @@ static struct inode *befs_iget(struct super_block *sb, unsigned long ino) | |||
304 | { | 304 | { |
305 | struct buffer_head *bh = NULL; | 305 | struct buffer_head *bh = NULL; |
306 | befs_inode *raw_inode = NULL; | 306 | befs_inode *raw_inode = NULL; |
307 | 307 | struct befs_sb_info *befs_sb = BEFS_SB(sb); | |
308 | befs_sb_info *befs_sb = BEFS_SB(sb); | ||
309 | befs_inode_info *befs_ino = NULL; | 308 | befs_inode_info *befs_ino = NULL; |
310 | struct inode *inode; | 309 | struct inode *inode; |
311 | long ret = -EIO; | 310 | long ret = -EIO; |
@@ -769,7 +768,7 @@ static int | |||
769 | befs_fill_super(struct super_block *sb, void *data, int silent) | 768 | befs_fill_super(struct super_block *sb, void *data, int silent) |
770 | { | 769 | { |
771 | struct buffer_head *bh; | 770 | struct buffer_head *bh; |
772 | befs_sb_info *befs_sb; | 771 | struct befs_sb_info *befs_sb; |
773 | befs_super_block *disk_sb; | 772 | befs_super_block *disk_sb; |
774 | struct inode *root; | 773 | struct inode *root; |
775 | long ret = -EINVAL; | 774 | long ret = -EINVAL; |
diff --git a/fs/befs/super.c b/fs/befs/super.c index ca40f828f64d..aeafc4d84278 100644 --- a/fs/befs/super.c +++ b/fs/befs/super.c | |||
@@ -24,7 +24,7 @@ | |||
24 | int | 24 | int |
25 | befs_load_sb(struct super_block *sb, befs_super_block * disk_sb) | 25 | befs_load_sb(struct super_block *sb, befs_super_block * disk_sb) |
26 | { | 26 | { |
27 | befs_sb_info *befs_sb = BEFS_SB(sb); | 27 | struct befs_sb_info *befs_sb = BEFS_SB(sb); |
28 | 28 | ||
29 | /* Check the byte order of the filesystem */ | 29 | /* Check the byte order of the filesystem */ |
30 | if (disk_sb->fs_byte_order == BEFS_BYTEORDER_NATIVE_LE) | 30 | if (disk_sb->fs_byte_order == BEFS_BYTEORDER_NATIVE_LE) |
@@ -59,7 +59,7 @@ befs_load_sb(struct super_block *sb, befs_super_block * disk_sb) | |||
59 | int | 59 | int |
60 | befs_check_sb(struct super_block *sb) | 60 | befs_check_sb(struct super_block *sb) |
61 | { | 61 | { |
62 | befs_sb_info *befs_sb = BEFS_SB(sb); | 62 | struct befs_sb_info *befs_sb = BEFS_SB(sb); |
63 | 63 | ||
64 | /* Check magic headers of super block */ | 64 | /* Check magic headers of super block */ |
65 | if ((befs_sb->magic1 != BEFS_SUPER_MAGIC1) | 65 | if ((befs_sb->magic1 != BEFS_SUPER_MAGIC1) |