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>
diff --git a/fs/nilfs2/bmap.h b/fs/nilfs2/bmap.h
index 379fda4..fae83cf 100644
--- a/fs/nilfs2/bmap.h
+++ b/fs/nilfs2/bmap.h
@@ -219,6 +219,13 @@
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 *);
diff --git a/fs/nilfs2/btree.c b/fs/nilfs2/btree.c
index 81e8716..0543bf9 100644
--- a/fs/nilfs2/btree.c
+++ b/fs/nilfs2/btree.c
@@ -917,13 +917,6 @@
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 @@
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 @@
}
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);
}
/**
diff --git a/fs/nilfs2/direct.c b/fs/nilfs2/direct.c
index cfc7218..3186130 100644
--- a/fs/nilfs2/direct.c
+++ b/fs/nilfs2/direct.c
@@ -116,13 +116,6 @@
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 @@
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);
}