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

Commit 75f65edf authored by Ryusuke Konishi's avatar Ryusuke Konishi
Browse files

nilfs2: remove newblk argument from nilfs_btnode_submit_block 



This removes the obsolete argument from nilfs_btnode_submit_block().
This will complete separating a create function of btree node.

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

fs/nilfs2/btnode.c

+3 −17
Original line number Diff line number Diff line
@@ -95,8 +95,7 @@ nilfs_btnode_create_block(struct address_space *btnc, __u64 blocknr) 
}



int nilfs_btnode_submit_block(struct address_space *btnc, __u64 blocknr,

			      sector_t pblocknr, struct buffer_head **pbh,

			      int newblk)

			      sector_t pblocknr, struct buffer_head **pbh)

{

	struct buffer_head *bh;

	struct inode *inode = NILFS_BTNC_I(btnc);
@@ -107,19 +106,6 @@ int nilfs_btnode_submit_block(struct address_space *btnc, __u64 blocknr, 
		return -ENOMEM;



	err = -EEXIST; /* internal code */

	if (newblk) {

		if (unlikely(buffer_mapped(bh) || buffer_uptodate(bh) ||

			     buffer_dirty(bh))) {

			brelse(bh);

			BUG();

		}

		memset(bh->b_data, 0, 1 << inode->i_blkbits);

		bh->b_bdev = NILFS_I_NILFS(inode)->ns_bdev;

		bh->b_blocknr = blocknr;

		set_buffer_mapped(bh);

		set_buffer_uptodate(bh);

		goto found;

	}



	if (buffer_uptodate(bh) || buffer_dirty(bh))

		goto found;
@@ -162,12 +148,12 @@ int nilfs_btnode_submit_block(struct address_space *btnc, __u64 blocknr, 
}



int nilfs_btnode_get(struct address_space *btnc, __u64 blocknr,

		     sector_t pblocknr, struct buffer_head **pbh, int newblk)

		     sector_t pblocknr, struct buffer_head **pbh)

{

	struct buffer_head *bh;

	int err;



	err = nilfs_btnode_submit_block(btnc, blocknr, pblocknr, pbh, newblk);

	err = nilfs_btnode_submit_block(btnc, blocknr, pblocknr, pbh);

	if (err == -EEXIST) /* internal code (cache hit) */

		return 0;

	if (unlikely(err))

fs/nilfs2/btnode.h

+2 −2
Original line number Diff line number Diff line
@@ -43,9 +43,9 @@ void nilfs_btnode_cache_clear(struct address_space *); 
struct buffer_head *nilfs_btnode_create_block(struct address_space *btnc,

					      __u64 blocknr);

int nilfs_btnode_submit_block(struct address_space *, __u64, sector_t,

			      struct buffer_head **, int);

			      struct buffer_head **);

int nilfs_btnode_get(struct address_space *, __u64, sector_t,

		     struct buffer_head **, int);

		     struct buffer_head **);

void nilfs_btnode_delete(struct buffer_head *);

int nilfs_btnode_prepare_change_key(struct address_space *,

				    struct nilfs_btnode_chkey_ctxt *);

fs/nilfs2/gcinode.c

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ int nilfs_gccache_submit_read_node(struct inode *inode, sector_t pbn, 
				   __u64 vbn, struct buffer_head **out_bh)

{

	int ret = nilfs_btnode_submit_block(&NILFS_I(inode)->i_btnode_cache,

					    vbn ? : pbn, pbn, out_bh, 0);

					    vbn ? : pbn, pbn, out_bh);

	if (ret == -EEXIST) /* internal code (cache hit) */

		ret = 0;

	return ret;