Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 583ada47 authored by Ryusuke Konishi's avatar Ryusuke Konishi
Browse files

nilfs2: remove constant qualifier from argument of bmap propagate 



The first argument of bops->bop_propagate operation takes a constant
qualifier, and causes compilation error when removed cast to pointer
of nilfs_btree structure type.  This fixes the issue to prepare for
succesive removal of nilfs_btree struct.

Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
parent 25b8d7de

fs/nilfs2/bmap.h

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ struct nilfs_bmap_operations { 
	int (*bop_delete)(struct nilfs_bmap *, __u64);

	void (*bop_clear)(struct nilfs_bmap *);



	int (*bop_propagate)(const struct nilfs_bmap *, struct buffer_head *);

	int (*bop_propagate)(struct nilfs_bmap *, struct buffer_head *);

	void (*bop_lookup_dirty_buffers)(struct nilfs_bmap *,

					 struct list_head *);

fs/nilfs2/btree.c

+2 −2
Original line number Diff line number Diff line
@@ -1899,7 +1899,7 @@ static int nilfs_btree_propagate_v(struct nilfs_btree *btree, 
	return ret;

}



static int nilfs_btree_propagate(const struct nilfs_bmap *bmap,

static int nilfs_btree_propagate(struct nilfs_bmap *bmap,

				 struct buffer_head *bh)

{

	struct nilfs_btree *btree;
@@ -1942,7 +1942,7 @@ static int nilfs_btree_propagate(const struct nilfs_bmap *bmap, 
	return ret;

}



static int nilfs_btree_propagate_gc(const struct nilfs_bmap *bmap,

static int nilfs_btree_propagate_gc(struct nilfs_bmap *bmap,

				    struct buffer_head *bh)

{

	return nilfs_dat_mark_dirty(nilfs_bmap_get_dat(bmap), bh->b_blocknr);

fs/nilfs2/direct.c

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ int nilfs_direct_delete_and_convert(struct nilfs_bmap *bmap, 
	return 0;

}



static int nilfs_direct_propagate(const struct nilfs_bmap *bmap,

static int nilfs_direct_propagate(struct nilfs_bmap *bmap,

				  struct buffer_head *bh)

{

	struct nilfs_direct *direct = (struct nilfs_direct *)bmap;