Skip to content

Commit 22341d8

Browse files
author
Al Viro
committed
befs: constify stuff a bit
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
1 parent e899108 commit 22341d8

6 files changed

Lines changed: 34 additions & 31 deletions

File tree

‎fs/befs/befs.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ BEFS_I(const struct inode *inode)
116116
}
117117

118118
static inline befs_blocknr_t
119-
iaddr2blockno(struct super_block *sb, befs_inode_addr * iaddr)
119+
iaddr2blockno(struct super_block *sb, const befs_inode_addr *iaddr)
120120
{
121121
return ((iaddr->allocation_group << BEFS_SB(sb)->ag_shift) +
122122
iaddr->start);
@@ -141,7 +141,7 @@ befs_iaddrs_per_block(struct super_block *sb)
141141
}
142142

143143
static inline int
144-
befs_iaddr_is_empty(befs_inode_addr * iaddr)
144+
befs_iaddr_is_empty(const befs_inode_addr *iaddr)
145145
{
146146
return (!iaddr->allocation_group) && (!iaddr->start) && (!iaddr->len);
147147
}

‎fs/befs/btree.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,15 @@ struct befs_btree_node {
8888
static const befs_off_t befs_bt_inval = 0xffffffffffffffffULL;
8989

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

96-
static int befs_bt_read_super(struct super_block *sb, befs_data_stream * ds,
96+
static int befs_bt_read_super(struct super_block *sb, const befs_data_stream *ds,
9797
befs_btree_super * sup);
9898

99-
static int befs_bt_read_node(struct super_block *sb, befs_data_stream * ds,
99+
static int befs_bt_read_node(struct super_block *sb, const befs_data_stream *ds,
100100
struct befs_btree_node *node,
101101
befs_off_t node_off);
102102

@@ -134,7 +134,7 @@ static int befs_compare_strings(const void *key1, int keylen1,
134134
* On failure, BEFS_ERR is returned.
135135
*/
136136
static int
137-
befs_bt_read_super(struct super_block *sb, befs_data_stream * ds,
137+
befs_bt_read_super(struct super_block *sb, const befs_data_stream *ds,
138138
befs_btree_super * sup)
139139
{
140140
struct buffer_head *bh;
@@ -193,7 +193,7 @@ befs_bt_read_super(struct super_block *sb, befs_data_stream * ds,
193193
*/
194194

195195
static int
196-
befs_bt_read_node(struct super_block *sb, befs_data_stream * ds,
196+
befs_bt_read_node(struct super_block *sb, const befs_data_stream *ds,
197197
struct befs_btree_node *node, befs_off_t node_off)
198198
{
199199
uint off = 0;
@@ -247,7 +247,7 @@ befs_bt_read_node(struct super_block *sb, befs_data_stream * ds,
247247
* actuall value stored with the key.
248248
*/
249249
int
250-
befs_btree_find(struct super_block *sb, befs_data_stream * ds,
250+
befs_btree_find(struct super_block *sb, const befs_data_stream *ds,
251251
const char *key, befs_off_t * value)
252252
{
253253
struct befs_btree_node *this_node;
@@ -416,7 +416,7 @@ befs_find_key(struct super_block *sb, struct befs_btree_node *node,
416416
* until the (key_no)th key is found or the tree is out of keys.
417417
*/
418418
int
419-
befs_btree_read(struct super_block *sb, befs_data_stream * ds,
419+
befs_btree_read(struct super_block *sb, const befs_data_stream *ds,
420420
loff_t key_no, size_t bufsize, char *keybuf, size_t * keysize,
421421
befs_off_t * value)
422422
{
@@ -548,7 +548,7 @@ befs_btree_read(struct super_block *sb, befs_data_stream * ds,
548548
* Also checks for an empty tree. If there are no keys, returns BEFS_BT_EMPTY.
549549
*/
550550
static int
551-
befs_btree_seekleaf(struct super_block *sb, befs_data_stream * ds,
551+
befs_btree_seekleaf(struct super_block *sb, const befs_data_stream *ds,
552552
befs_btree_super *bt_super,
553553
struct befs_btree_node *this_node,
554554
befs_off_t * node_off)

‎fs/befs/btree.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
*/
55

66

7-
int befs_btree_find(struct super_block *sb, befs_data_stream * ds,
7+
int befs_btree_find(struct super_block *sb, const befs_data_stream *ds,
88
const char *key, befs_off_t * value);
99

10-
int befs_btree_read(struct super_block *sb, befs_data_stream * ds,
10+
int befs_btree_read(struct super_block *sb, const befs_data_stream *ds,
1111
loff_t key_no, size_t bufsize, char *keybuf,
1212
size_t * keysize, befs_off_t * value);
1313

‎fs/befs/datastream.c‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@
2121
const befs_inode_addr BAD_IADDR = { 0, 0, 0 };
2222

2323
static int befs_find_brun_direct(struct super_block *sb,
24-
befs_data_stream * data,
24+
const befs_data_stream *data,
2525
befs_blocknr_t blockno, befs_block_run * run);
2626

2727
static int befs_find_brun_indirect(struct super_block *sb,
28-
befs_data_stream * data,
28+
const befs_data_stream *data,
2929
befs_blocknr_t blockno,
3030
befs_block_run * run);
3131

3232
static int befs_find_brun_dblindirect(struct super_block *sb,
33-
befs_data_stream * data,
33+
const befs_data_stream *data,
3434
befs_blocknr_t blockno,
3535
befs_block_run * run);
3636

@@ -45,7 +45,7 @@ static int befs_find_brun_dblindirect(struct super_block *sb,
4545
* if you don't need to know offset just set @off = NULL.
4646
*/
4747
struct buffer_head *
48-
befs_read_datastream(struct super_block *sb, befs_data_stream * ds,
48+
befs_read_datastream(struct super_block *sb, const befs_data_stream *ds,
4949
befs_off_t pos, uint * off)
5050
{
5151
struct buffer_head *bh = NULL;
@@ -87,7 +87,7 @@ befs_read_datastream(struct super_block *sb, befs_data_stream * ds,
8787
* 2001-11-15 Will Dyson
8888
*/
8989
int
90-
befs_fblock2brun(struct super_block *sb, befs_data_stream * data,
90+
befs_fblock2brun(struct super_block *sb, const befs_data_stream *data,
9191
befs_blocknr_t fblock, befs_block_run * run)
9292
{
9393
int err;
@@ -122,8 +122,8 @@ befs_fblock2brun(struct super_block *sb, befs_data_stream * data,
122122
* Returns the number of bytes read
123123
*/
124124
size_t
125-
befs_read_lsymlink(struct super_block * sb, befs_data_stream * ds, void *buff,
126-
befs_off_t len)
125+
befs_read_lsymlink(struct super_block *sb, const befs_data_stream *ds,
126+
void *buff, befs_off_t len)
127127
{
128128
befs_off_t bytes_read = 0; /* bytes readed */
129129
u16 plen;
@@ -163,7 +163,7 @@ befs_read_lsymlink(struct super_block * sb, befs_data_stream * ds, void *buff,
163163
*/
164164

165165
befs_blocknr_t
166-
befs_count_blocks(struct super_block * sb, befs_data_stream * ds)
166+
befs_count_blocks(struct super_block *sb, const befs_data_stream *ds)
167167
{
168168
befs_blocknr_t blocks;
169169
befs_blocknr_t datablocks; /* File data blocks */
@@ -243,11 +243,11 @@ befs_count_blocks(struct super_block * sb, befs_data_stream * ds)
243243
2001-11-15 Will Dyson
244244
*/
245245
static int
246-
befs_find_brun_direct(struct super_block *sb, befs_data_stream * data,
246+
befs_find_brun_direct(struct super_block *sb, const befs_data_stream *data,
247247
befs_blocknr_t blockno, befs_block_run * run)
248248
{
249249
int i;
250-
befs_block_run *array = data->direct;
250+
const befs_block_run *array = data->direct;
251251
befs_blocknr_t sum;
252252
befs_blocknr_t max_block =
253253
data->max_direct_range >> BEFS_SB(sb)->block_shift;
@@ -304,7 +304,8 @@ befs_find_brun_direct(struct super_block *sb, befs_data_stream * data,
304304
*/
305305
static int
306306
befs_find_brun_indirect(struct super_block *sb,
307-
befs_data_stream * data, befs_blocknr_t blockno,
307+
const befs_data_stream *data,
308+
befs_blocknr_t blockno,
308309
befs_block_run * run)
309310
{
310311
int i, j;
@@ -412,7 +413,8 @@ befs_find_brun_indirect(struct super_block *sb,
412413
*/
413414
static int
414415
befs_find_brun_dblindirect(struct super_block *sb,
415-
befs_data_stream * data, befs_blocknr_t blockno,
416+
const befs_data_stream *data,
417+
befs_blocknr_t blockno,
416418
befs_block_run * run)
417419
{
418420
int dblindir_indx;

‎fs/befs/datastream.h‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@
44
*/
55

66
struct buffer_head *befs_read_datastream(struct super_block *sb,
7-
befs_data_stream * ds, befs_off_t pos,
8-
uint * off);
7+
const befs_data_stream *ds,
8+
befs_off_t pos, uint * off);
99

10-
int befs_fblock2brun(struct super_block *sb, befs_data_stream * data,
10+
int befs_fblock2brun(struct super_block *sb, const befs_data_stream *data,
1111
befs_blocknr_t fblock, befs_block_run * run);
1212

13-
size_t befs_read_lsymlink(struct super_block *sb, befs_data_stream * data,
13+
size_t befs_read_lsymlink(struct super_block *sb, const befs_data_stream *data,
1414
void *buff, befs_off_t len);
1515

16-
befs_blocknr_t befs_count_blocks(struct super_block *sb, befs_data_stream * ds);
16+
befs_blocknr_t befs_count_blocks(struct super_block *sb,
17+
const befs_data_stream *ds);
1718

1819
extern const befs_inode_addr BAD_IADDR;
1920

‎fs/befs/linuxvfs.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ befs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags)
157157
{
158158
struct inode *inode = NULL;
159159
struct super_block *sb = dir->i_sb;
160-
befs_data_stream *ds = &BEFS_I(dir)->i_data.ds;
160+
const befs_data_stream *ds = &BEFS_I(dir)->i_data.ds;
161161
befs_off_t offset;
162162
int ret;
163163
int utfnamelen;
@@ -207,7 +207,7 @@ befs_readdir(struct file *file, struct dir_context *ctx)
207207
{
208208
struct inode *inode = file_inode(file);
209209
struct super_block *sb = inode->i_sb;
210-
befs_data_stream *ds = &BEFS_I(inode)->i_data.ds;
210+
const befs_data_stream *ds = &BEFS_I(inode)->i_data.ds;
211211
befs_off_t value;
212212
int result;
213213
size_t keysize;

0 commit comments

Comments
 (0)