befs: constify stuff a bit

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/befs/befs.h b/fs/befs/befs.h
index 35d19e8731e35b8aabfe9cdaaf32d11b9b17b326..e0f59263a96d5944c1a5315e17bf9ee872309b9f 100644 (file)
--- a/fs/befs/befs.h
+++ b/fs/befs/befs.h
@@ -116,7 +116,7 @@ BEFS_I(const struct inode *inode)
 }
 
 static inline befs_blocknr_t
-iaddr2blockno(struct super_block *sb, befs_inode_addr * iaddr)
+iaddr2blockno(struct super_block *sb, const befs_inode_addr *iaddr)
 {
        return ((iaddr->allocation_group << BEFS_SB(sb)->ag_shift) +
                iaddr->start);
@@ -141,7 +141,7 @@ befs_iaddrs_per_block(struct super_block *sb)
 }
 
 static inline int
-befs_iaddr_is_empty(befs_inode_addr * iaddr)
+befs_iaddr_is_empty(const befs_inode_addr *iaddr)
 {
        return (!iaddr->allocation_group) && (!iaddr->start) && (!iaddr->len);
 }

diff --git a/fs/befs/btree.c b/fs/befs/btree.c
index 22c166280883064c7fc42455ccb905cb386cc7e2..307645f9e284c546db0e3d94e989e3064791b343 100644 (file)
--- a/fs/befs/btree.c
+++ b/fs/befs/btree.c
@@ -88,15 +88,15 @@ struct befs_btree_node {
 static const befs_off_t befs_bt_inval = 0xffffffffffffffffULL;
 
 /* local functions */
-static int befs_btree_seekleaf(struct super_block *sb, befs_data_stream * ds,
+static int befs_btree_seekleaf(struct super_block *sb, const befs_data_stream *ds,
                               befs_btree_super * bt_super,
                               struct befs_btree_node *this_node,
                               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, const befs_data_stream *ds,
                              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, const befs_data_stream *ds,
                             struct befs_btree_node *node,
                             befs_off_t node_off);
 
@@ -134,7 +134,7 @@ static int befs_compare_strings(const void *key1, int keylen1,
  * On failure, BEFS_ERR is returned.
  */
 static int
-befs_bt_read_super(struct super_block *sb, befs_data_stream * ds,
+befs_bt_read_super(struct super_block *sb, const befs_data_stream *ds,
                   befs_btree_super * sup)
 {
        struct buffer_head *bh;
@@ -193,7 +193,7 @@ befs_bt_read_super(struct super_block *sb, befs_data_stream * ds,
  */
 
 static int
-befs_bt_read_node(struct super_block *sb, befs_data_stream * ds,
+befs_bt_read_node(struct super_block *sb, const befs_data_stream *ds,
                  struct befs_btree_node *node, befs_off_t node_off)
 {
        uint off = 0;
@@ -247,7 +247,7 @@ befs_bt_read_node(struct super_block *sb, befs_data_stream * ds,
  *   actuall value stored with the key.
  */
 int
-befs_btree_find(struct super_block *sb, befs_data_stream * ds,
+befs_btree_find(struct super_block *sb, const befs_data_stream *ds,
                const char *key, befs_off_t * value)
 {
        struct befs_btree_node *this_node;
@@ -416,7 +416,7 @@ befs_find_key(struct super_block *sb, struct befs_btree_node *node,
  *   until the (key_no)th key is found or the tree is out of keys.
  */
 int
-befs_btree_read(struct super_block *sb, befs_data_stream * ds,
+befs_btree_read(struct super_block *sb, const befs_data_stream *ds,
                loff_t key_no, size_t bufsize, char *keybuf, size_t * keysize,
                befs_off_t * value)
 {
@@ -548,7 +548,7 @@ befs_btree_read(struct super_block *sb, befs_data_stream * ds,
  * Also checks for an empty tree. If there are no keys, returns BEFS_BT_EMPTY.
  */
 static int
-befs_btree_seekleaf(struct super_block *sb, befs_data_stream * ds,
+befs_btree_seekleaf(struct super_block *sb, const befs_data_stream *ds,
                    befs_btree_super *bt_super,
                    struct befs_btree_node *this_node,
                    befs_off_t * node_off)

diff --git a/fs/befs/btree.h b/fs/befs/btree.h
index 92e781e5f30ef76d2c5287e9b15d7330fc8a9601..f2a8f637e9e07faf3faf7773737bdaea257ddf29 100644 (file)
--- a/fs/befs/btree.h
+++ b/fs/befs/btree.h
@@ -4,10 +4,10 @@
  */
 
 
-int befs_btree_find(struct super_block *sb, befs_data_stream * ds,
+int befs_btree_find(struct super_block *sb, const befs_data_stream *ds,
                    const char *key, befs_off_t * value);
 
-int befs_btree_read(struct super_block *sb, befs_data_stream * ds,
+int befs_btree_read(struct super_block *sb, const befs_data_stream *ds,
                    loff_t key_no, size_t bufsize, char *keybuf,
                    size_t * keysize, befs_off_t * value);
 

diff --git a/fs/befs/datastream.c b/fs/befs/datastream.c
index ebd50718659f228a1c34a94af410de8d7a46e728..dde0b79f3948b348e420be5f17414e9ea7604ce3 100644 (file)
--- a/fs/befs/datastream.c
+++ b/fs/befs/datastream.c
@@ -21,16 +21,16 @@
 const befs_inode_addr BAD_IADDR = { 0, 0, 0 };
 
 static int befs_find_brun_direct(struct super_block *sb,
-                                befs_data_stream * data,
+                                const befs_data_stream *data,
                                 befs_blocknr_t blockno, befs_block_run * run);
 
 static int befs_find_brun_indirect(struct super_block *sb,
-                                  befs_data_stream * data,
+                                  const befs_data_stream *data,
                                   befs_blocknr_t blockno,
                                   befs_block_run * run);
 
 static int befs_find_brun_dblindirect(struct super_block *sb,
-                                     befs_data_stream * data,
+                                     const befs_data_stream *data,
                                      befs_blocknr_t blockno,
                                      befs_block_run * run);
 
@@ -45,7 +45,7 @@ static int befs_find_brun_dblindirect(struct super_block *sb,
  * if you don't need to know offset just set @off = NULL.
  */
 struct buffer_head *
-befs_read_datastream(struct super_block *sb, befs_data_stream * ds,
+befs_read_datastream(struct super_block *sb, const befs_data_stream *ds,
                     befs_off_t pos, uint * off)
 {
        struct buffer_head *bh = NULL;
@@ -87,7 +87,7 @@ befs_read_datastream(struct super_block *sb, befs_data_stream * ds,
  * 2001-11-15 Will Dyson
  */
 int
-befs_fblock2brun(struct super_block *sb, befs_data_stream * data,
+befs_fblock2brun(struct super_block *sb, const befs_data_stream *data,
                 befs_blocknr_t fblock, befs_block_run * run)
 {
        int err;
@@ -122,8 +122,8 @@ befs_fblock2brun(struct super_block *sb, befs_data_stream * data,
  * Returns the number of bytes read
  */
 size_t
-befs_read_lsymlink(struct super_block * sb, befs_data_stream * ds, void *buff,
-                  befs_off_t len)
+befs_read_lsymlink(struct super_block *sb, const befs_data_stream *ds,
+                  void *buff, befs_off_t len)
 {
        befs_off_t bytes_read = 0;      /* bytes readed */
        u16 plen;
@@ -163,7 +163,7 @@ befs_read_lsymlink(struct super_block * sb, befs_data_stream * ds, void *buff,
 */
 
 befs_blocknr_t
-befs_count_blocks(struct super_block * sb, befs_data_stream * ds)
+befs_count_blocks(struct super_block *sb, const befs_data_stream *ds)
 {
        befs_blocknr_t blocks;
        befs_blocknr_t datablocks;      /* File data blocks */
@@ -243,11 +243,11 @@ befs_count_blocks(struct super_block * sb, befs_data_stream * ds)
        2001-11-15 Will Dyson
 */
 static int
-befs_find_brun_direct(struct super_block *sb, befs_data_stream * data,
+befs_find_brun_direct(struct super_block *sb, const befs_data_stream *data,
                      befs_blocknr_t blockno, befs_block_run * run)
 {
        int i;
-       befs_block_run *array = data->direct;
+       const befs_block_run *array = data->direct;
        befs_blocknr_t sum;
        befs_blocknr_t max_block =
            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,
 */
 static int
 befs_find_brun_indirect(struct super_block *sb,
-                       befs_data_stream * data, befs_blocknr_t blockno,
+                       const befs_data_stream *data,
+                       befs_blocknr_t blockno,
                        befs_block_run * run)
 {
        int i, j;
@@ -412,7 +413,8 @@ befs_find_brun_indirect(struct super_block *sb,
 */
 static int
 befs_find_brun_dblindirect(struct super_block *sb,
-                          befs_data_stream * data, befs_blocknr_t blockno,
+                          const befs_data_stream *data,
+                          befs_blocknr_t blockno,
                           befs_block_run * run)
 {
        int dblindir_indx;

diff --git a/fs/befs/datastream.h b/fs/befs/datastream.h
index 45e8a3c98249c0c662cbbdf5dbd9b821dc44ce9a..91ba8203d83f221278df23e8bb4ab5c3e9cb6d11 100644 (file)
--- a/fs/befs/datastream.h
+++ b/fs/befs/datastream.h
@@ -4,16 +4,17 @@
  */
 
 struct buffer_head *befs_read_datastream(struct super_block *sb,
-                                        befs_data_stream * ds, befs_off_t pos,
-                                        uint * off);
+                                        const befs_data_stream *ds,
+                                        befs_off_t pos, uint * off);
 
-int befs_fblock2brun(struct super_block *sb, befs_data_stream * data,
+int befs_fblock2brun(struct super_block *sb, const befs_data_stream *data,
                     befs_blocknr_t fblock, befs_block_run * run);
 
-size_t befs_read_lsymlink(struct super_block *sb, befs_data_stream * data,
+size_t befs_read_lsymlink(struct super_block *sb, const befs_data_stream *data,
                          void *buff, befs_off_t len);
 
-befs_blocknr_t befs_count_blocks(struct super_block *sb, befs_data_stream * ds);
+befs_blocknr_t befs_count_blocks(struct super_block *sb,
+                         const befs_data_stream *ds);
 
 extern const befs_inode_addr BAD_IADDR;
 

diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
index cc0e08252913a46141c939d323485a55eb74760f..f168bc8f621248f96528b8cfe934e250c3b19a5f 100644 (file)
--- a/fs/befs/linuxvfs.c
+++ b/fs/befs/linuxvfs.c
@@ -157,7 +157,7 @@ befs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags)
 {
        struct inode *inode = NULL;
        struct super_block *sb = dir->i_sb;
-       befs_data_stream *ds = &BEFS_I(dir)->i_data.ds;
+       const befs_data_stream *ds = &BEFS_I(dir)->i_data.ds;
        befs_off_t offset;
        int ret;
        int utfnamelen;
@@ -207,7 +207,7 @@ befs_readdir(struct file *file, struct dir_context *ctx)
 {
        struct inode *inode = file_inode(file);
        struct super_block *sb = inode->i_sb;
-       befs_data_stream *ds = &BEFS_I(inode)->i_data.ds;
+       const befs_data_stream *ds = &BEFS_I(inode)->i_data.ds;
        befs_off_t value;
        int result;
        size_t keysize;