diff options
author | Luis de Bethencourt <luisbg@osg.samsung.com> | 2016-08-14 13:31:38 -0400 |
---|---|---|
committer | Luis de Bethencourt <luisbg@osg.samsung.com> | 2016-12-22 06:25:22 -0500 |
commit | 12ecb38d03cff0c6d09262f0334f4ded3242ae87 (patch) | |
tree | ad26bcc331a779cda295dee9d145cb7251e226e7 /fs/befs | |
parent | 62b80719dfe126f73e417d7011dfb5ef53c6a203 (diff) |
befs: fix style issues in header files
Fixing checkpatch.pl issues in befs header files:
WARNING: Missing a blank line after declarations
+ befs_inode_addr iaddr;
+ iaddr.allocation_group = blockno >> BEFS_SB(sb)->ag_shift;
WARNING: space prohibited between function name and open parenthesis '('
+ return BEFS_SB(sb)->block_size / sizeof (befs_disk_inode_addr);
ERROR: "foo * bar" should be "foo *bar"
+ const char *key, befs_off_t * value);
ERROR: Macros with complex values should be enclosed in parentheses
+#define PACKED __attribute__ ((__packed__))
Signed-off-by: Luis de Bethencourt <luisbg@osg.samsung.com>
Diffstat (limited to 'fs/befs')
-rw-r--r-- | fs/befs/befs.h | 3 | ||||
-rw-r--r-- | fs/befs/befs_fs_types.h | 8 | ||||
-rw-r--r-- | fs/befs/btree.h | 6 | ||||
-rw-r--r-- | fs/befs/datastream.h | 5 | ||||
-rw-r--r-- | fs/befs/inode.h | 3 | ||||
-rw-r--r-- | fs/befs/super.h | 4 |
6 files changed, 12 insertions, 17 deletions
diff --git a/fs/befs/befs.h b/fs/befs/befs.h index c6bad51d8ec7..b914cfb03820 100644 --- a/fs/befs/befs.h +++ b/fs/befs/befs.h | |||
@@ -129,6 +129,7 @@ static inline befs_inode_addr | |||
129 | blockno2iaddr(struct super_block *sb, befs_blocknr_t blockno) | 129 | blockno2iaddr(struct super_block *sb, befs_blocknr_t blockno) |
130 | { | 130 | { |
131 | befs_inode_addr iaddr; | 131 | befs_inode_addr iaddr; |
132 | |||
132 | iaddr.allocation_group = blockno >> BEFS_SB(sb)->ag_shift; | 133 | iaddr.allocation_group = blockno >> BEFS_SB(sb)->ag_shift; |
133 | iaddr.start = | 134 | iaddr.start = |
134 | blockno - (iaddr.allocation_group << BEFS_SB(sb)->ag_shift); | 135 | blockno - (iaddr.allocation_group << BEFS_SB(sb)->ag_shift); |
@@ -140,7 +141,7 @@ blockno2iaddr(struct super_block *sb, befs_blocknr_t blockno) | |||
140 | static inline unsigned int | 141 | static inline unsigned int |
141 | befs_iaddrs_per_block(struct super_block *sb) | 142 | befs_iaddrs_per_block(struct super_block *sb) |
142 | { | 143 | { |
143 | return BEFS_SB(sb)->block_size / sizeof (befs_disk_inode_addr); | 144 | return BEFS_SB(sb)->block_size / sizeof(befs_disk_inode_addr); |
144 | } | 145 | } |
145 | 146 | ||
146 | #include "endian.h" | 147 | #include "endian.h" |
diff --git a/fs/befs/befs_fs_types.h b/fs/befs/befs_fs_types.h index eb557d9dc8be..eda332593ecc 100644 --- a/fs/befs/befs_fs_types.h +++ b/fs/befs/befs_fs_types.h | |||
@@ -55,12 +55,12 @@ enum super_flags { | |||
55 | }; | 55 | }; |
56 | 56 | ||
57 | #define BEFS_BYTEORDER_NATIVE 0x42494745 | 57 | #define BEFS_BYTEORDER_NATIVE 0x42494745 |
58 | #define BEFS_BYTEORDER_NATIVE_LE (__force fs32)cpu_to_le32(BEFS_BYTEORDER_NATIVE) | 58 | #define BEFS_BYTEORDER_NATIVE_LE ((__force fs32)cpu_to_le32(BEFS_BYTEORDER_NATIVE)) |
59 | #define BEFS_BYTEORDER_NATIVE_BE (__force fs32)cpu_to_be32(BEFS_BYTEORDER_NATIVE) | 59 | #define BEFS_BYTEORDER_NATIVE_BE ((__force fs32)cpu_to_be32(BEFS_BYTEORDER_NATIVE)) |
60 | 60 | ||
61 | #define BEFS_SUPER_MAGIC BEFS_SUPER_MAGIC1 | 61 | #define BEFS_SUPER_MAGIC BEFS_SUPER_MAGIC1 |
62 | #define BEFS_SUPER_MAGIC1_LE (__force fs32)cpu_to_le32(BEFS_SUPER_MAGIC1) | 62 | #define BEFS_SUPER_MAGIC1_LE ((__force fs32)cpu_to_le32(BEFS_SUPER_MAGIC1)) |
63 | #define BEFS_SUPER_MAGIC1_BE (__force fs32)cpu_to_be32(BEFS_SUPER_MAGIC1) | 63 | #define BEFS_SUPER_MAGIC1_BE ((__force fs32)cpu_to_be32(BEFS_SUPER_MAGIC1)) |
64 | 64 | ||
65 | /* | 65 | /* |
66 | * Flags of inode | 66 | * Flags of inode |
diff --git a/fs/befs/btree.h b/fs/befs/btree.h index f2a8f637e9e0..3da90f56cfd4 100644 --- a/fs/befs/btree.h +++ b/fs/befs/btree.h | |||
@@ -3,11 +3,9 @@ | |||
3 | * | 3 | * |
4 | */ | 4 | */ |
5 | 5 | ||
6 | |||
7 | int befs_btree_find(struct super_block *sb, const befs_data_stream *ds, | 6 | int befs_btree_find(struct super_block *sb, const befs_data_stream *ds, |
8 | const char *key, befs_off_t * value); | 7 | const char *key, befs_off_t *value); |
9 | 8 | ||
10 | int befs_btree_read(struct super_block *sb, const befs_data_stream *ds, | 9 | int befs_btree_read(struct super_block *sb, const befs_data_stream *ds, |
11 | loff_t key_no, size_t bufsize, char *keybuf, | 10 | loff_t key_no, size_t bufsize, char *keybuf, |
12 | size_t * keysize, befs_off_t * value); | 11 | size_t *keysize, befs_off_t *value); |
13 | |||
diff --git a/fs/befs/datastream.h b/fs/befs/datastream.h index 91ba8203d83f..7ff9ff09ec6e 100644 --- a/fs/befs/datastream.h +++ b/fs/befs/datastream.h | |||
@@ -5,10 +5,10 @@ | |||
5 | 5 | ||
6 | struct buffer_head *befs_read_datastream(struct super_block *sb, | 6 | struct buffer_head *befs_read_datastream(struct super_block *sb, |
7 | const befs_data_stream *ds, | 7 | const befs_data_stream *ds, |
8 | befs_off_t pos, uint * off); | 8 | befs_off_t pos, uint *off); |
9 | 9 | ||
10 | int befs_fblock2brun(struct super_block *sb, const befs_data_stream *data, | 10 | int befs_fblock2brun(struct super_block *sb, const befs_data_stream *data, |
11 | befs_blocknr_t fblock, befs_block_run * run); | 11 | befs_blocknr_t fblock, befs_block_run *run); |
12 | 12 | ||
13 | size_t befs_read_lsymlink(struct super_block *sb, const befs_data_stream *data, | 13 | size_t befs_read_lsymlink(struct super_block *sb, const befs_data_stream *data, |
14 | void *buff, befs_off_t len); | 14 | void *buff, befs_off_t len); |
@@ -17,4 +17,3 @@ befs_blocknr_t befs_count_blocks(struct super_block *sb, | |||
17 | const befs_data_stream *ds); | 17 | const befs_data_stream *ds); |
18 | 18 | ||
19 | extern const befs_inode_addr BAD_IADDR; | 19 | extern const befs_inode_addr BAD_IADDR; |
20 | |||
diff --git a/fs/befs/inode.h b/fs/befs/inode.h index 9dc7fd9b7570..0598f3fffc1c 100644 --- a/fs/befs/inode.h +++ b/fs/befs/inode.h | |||
@@ -3,6 +3,5 @@ | |||
3 | * | 3 | * |
4 | */ | 4 | */ |
5 | 5 | ||
6 | int befs_check_inode(struct super_block *sb, befs_inode * raw_inode, | 6 | int befs_check_inode(struct super_block *sb, befs_inode *raw_inode, |
7 | befs_blocknr_t inode); | 7 | befs_blocknr_t inode); |
8 | |||
diff --git a/fs/befs/super.h b/fs/befs/super.h index dc4556376a22..ec1df30a7e9a 100644 --- a/fs/befs/super.h +++ b/fs/befs/super.h | |||
@@ -2,7 +2,5 @@ | |||
2 | * super.h | 2 | * super.h |
3 | */ | 3 | */ |
4 | 4 | ||
5 | int befs_load_sb(struct super_block *sb, befs_super_block * disk_sb); | 5 | int befs_load_sb(struct super_block *sb, befs_super_block *disk_sb); |
6 | |||
7 | int befs_check_sb(struct super_block *sb); | 6 | int befs_check_sb(struct super_block *sb); |
8 | |||