diff options
author | Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> | 2010-07-10 09:21:54 -0400 |
---|---|---|
committer | Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> | 2010-07-22 21:02:14 -0400 |
commit | dc935be2a094087bc561d80f8cf9e66bbc1f7b18 (patch) | |
tree | ab7af5a2a40633f74a949916de7797c3d8f345b7 /fs/nilfs2/direct.c | |
parent | e7c274f8083793f8f861def63c02a0839b34d26d (diff) |
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>
Diffstat (limited to 'fs/nilfs2/direct.c')
-rw-r--r-- | fs/nilfs2/direct.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/fs/nilfs2/direct.c b/fs/nilfs2/direct.c index cfc7218914d6..318613010106 100644 --- a/fs/nilfs2/direct.c +++ b/fs/nilfs2/direct.c | |||
@@ -116,13 +116,6 @@ nilfs_direct_find_target_v(const struct nilfs_bmap *direct, __u64 key) | |||
116 | return nilfs_bmap_find_target_in_group(direct); | 116 | return nilfs_bmap_find_target_in_group(direct); |
117 | } | 117 | } |
118 | 118 | ||
119 | static void nilfs_direct_set_target_v(struct nilfs_bmap *direct, | ||
120 | __u64 key, __u64 ptr) | ||
121 | { | ||
122 | direct->b_last_allocated_key = key; | ||
123 | direct->b_last_allocated_ptr = ptr; | ||
124 | } | ||
125 | |||
126 | static int nilfs_direct_insert(struct nilfs_bmap *bmap, __u64 key, __u64 ptr) | 119 | static int nilfs_direct_insert(struct nilfs_bmap *bmap, __u64 key, __u64 ptr) |
127 | { | 120 | { |
128 | union nilfs_bmap_ptr_req req; | 121 | union nilfs_bmap_ptr_req req; |
@@ -152,7 +145,7 @@ static int nilfs_direct_insert(struct nilfs_bmap *bmap, __u64 key, __u64 ptr) | |||
152 | nilfs_bmap_set_dirty(bmap); | 145 | nilfs_bmap_set_dirty(bmap); |
153 | 146 | ||
154 | if (NILFS_BMAP_USE_VBN(bmap)) | 147 | if (NILFS_BMAP_USE_VBN(bmap)) |
155 | nilfs_direct_set_target_v(bmap, key, req.bpr_ptr); | 148 | nilfs_bmap_set_target_v(bmap, key, req.bpr_ptr); |
156 | 149 | ||
157 | nilfs_bmap_add_blocks(bmap, 1); | 150 | nilfs_bmap_add_blocks(bmap, 1); |
158 | } | 151 | } |