redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

nilfs2: unify bmap set_target_v operations 

This unifies two similar functions nilfs_btree_set_target_v and
nilfs_direct_set_target_v into one, nilfs_bmap_set_target_v.

Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
hifive-unleashed-5.1
Ryusuke Konishi 2010-07-10 22:21:54 +09:00
parent e7c274f808
commit dc935be2a0
3 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/nilfs2/bmap.h
View File

@ -219,6 +219,13 @@ static inline void nilfs_bmap_abort_end_ptr(struct nilfs_bmap *bmap,
nilfs_dat_abort_end(dat, &req->bpr_req);
}
static inline void nilfs_bmap_set_target_v(struct nilfs_bmap *bmap, __u64 key,
__u64 ptr)
{
bmap->b_last_allocated_key = key;
bmap->b_last_allocated_ptr = ptr;
}
__u64 nilfs_bmap_data_get_key(const struct nilfs_bmap *,
const struct buffer_head *);

11
fs/nilfs2/btree.c
View File

@ -917,13 +917,6 @@ static __u64 nilfs_btree_find_target_v(const struct nilfs_bmap *btree,
return nilfs_bmap_find_target_in_group(btree);
}
static void nilfs_btree_set_target_v(struct nilfs_bmap *btree, __u64 key,
__u64 ptr)
{
btree->b_last_allocated_key = key;
btree->b_last_allocated_ptr = ptr;
}
static int nilfs_btree_prepare_insert(struct nilfs_bmap *btree,
struct nilfs_btree_path *path,
int *levelp, __u64 key, __u64 ptr,
@ -1084,7 +1077,7 @@ static void nilfs_btree_commit_insert(struct nilfs_bmap *btree,
set_buffer_nilfs_volatile((struct buffer_head *)((unsigned long)ptr));
ptr = path[NILFS_BTREE_LEVEL_DATA].bp_newreq.bpr_ptr;
if (NILFS_BMAP_USE_VBN(btree)) {
nilfs_btree_set_target_v(btree, key, ptr);
nilfs_bmap_set_target_v(btree, key, ptr);
dat = nilfs_bmap_get_dat(btree);
}
@ -1662,7 +1655,7 @@ nilfs_btree_commit_convert_and_insert(struct nilfs_bmap *btree,
}
if (NILFS_BMAP_USE_VBN(btree))
nilfs_btree_set_target_v(btree, key, dreq->bpr_ptr);
nilfs_bmap_set_target_v(btree, key, dreq->bpr_ptr);
}
/**

9
fs/nilfs2/direct.c
View File

@ -116,13 +116,6 @@ nilfs_direct_find_target_v(const struct nilfs_bmap *direct, __u64 key)
return nilfs_bmap_find_target_in_group(direct);
}
static void nilfs_direct_set_target_v(struct nilfs_bmap *direct,
__u64 key, __u64 ptr)
{
direct->b_last_allocated_key = key;
direct->b_last_allocated_ptr = ptr;
}
static int nilfs_direct_insert(struct nilfs_bmap *bmap, __u64 key, __u64 ptr)
{
union nilfs_bmap_ptr_req req;
@ -152,7 +145,7 @@ static int nilfs_direct_insert(struct nilfs_bmap *bmap, __u64 key, __u64 ptr)
nilfs_bmap_set_dirty(bmap);
if (NILFS_BMAP_USE_VBN(bmap))
nilfs_direct_set_target_v(bmap, key, req.bpr_ptr);
nilfs_bmap_set_target_v(bmap, key, req.bpr_ptr);
nilfs_bmap_add_blocks(bmap, 1);
}