From b9c2e408ec016542d89160585fc2be2396aa8a4e Mon Sep 17 00:00:00 2001
From: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Date: Sat, 10 Jul 2010 22:21:54 +0900
Subject: [PATCH] --- yaml --- r: 206355 b: refs/heads/master c:
 dc935be2a094087bc561d80f8cf9e66bbc1f7b18 h: refs/heads/master i:   206353:
 484f3c9e2fc11fa85f893e98d9c6b81e38e7a5ae   206351:
 19219cd832990c37cc544bf6edc2d355982886ce v: v3

---
 [refs]                   |  2 +-
 trunk/fs/nilfs2/bmap.h   |  7 +++++++
 trunk/fs/nilfs2/btree.c  | 11 ++---------
 trunk/fs/nilfs2/direct.c |  9 +--------
 4 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index f0eba13308ba..38d18565ba5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7c274f8083793f8f861def63c02a0839b34d26d
+refs/heads/master: dc935be2a094087bc561d80f8cf9e66bbc1f7b18
diff --git a/trunk/fs/nilfs2/bmap.h b/trunk/fs/nilfs2/bmap.h
index 379fda4c668c..fae83cf9c009 100644
--- a/trunk/fs/nilfs2/bmap.h
+++ b/trunk/fs/nilfs2/bmap.h
@@ -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 *);
 
diff --git a/trunk/fs/nilfs2/btree.c b/trunk/fs/nilfs2/btree.c
index 81e871645b5f..0543bf9f80ba 100644
--- a/trunk/fs/nilfs2/btree.c
+++ b/trunk/fs/nilfs2/btree.c
@@ -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);
 }
 
 /**
diff --git a/trunk/fs/nilfs2/direct.c b/trunk/fs/nilfs2/direct.c
index cfc7218914d6..318613010106 100644
--- a/trunk/fs/nilfs2/direct.c
+++ b/trunk/fs/nilfs2/direct.c
@@ -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);
 	}