aboutsummaryrefslogtreecommitdiffstats
path: root/fs/logfs/segment.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/logfs/segment.c')
-rw-r--r--fs/logfs/segment.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/fs/logfs/segment.c b/fs/logfs/segment.c
index 0ecd8f07c11e..f77ce2b470ba 100644
--- a/fs/logfs/segment.c
+++ b/fs/logfs/segment.c
@@ -10,6 +10,7 @@
10 * three kinds of objects: inodes, dentries and blocks, both data and indirect. 10 * three kinds of objects: inodes, dentries and blocks, both data and indirect.
11 */ 11 */
12#include "logfs.h" 12#include "logfs.h"
13#include <linux/slab.h>
13 14
14static int logfs_mark_segment_bad(struct super_block *sb, u32 segno) 15static int logfs_mark_segment_bad(struct super_block *sb, u32 segno)
15{ 16{
@@ -182,14 +183,8 @@ static int btree_write_alias(struct super_block *sb, struct logfs_block *block,
182 return 0; 183 return 0;
183} 184}
184 185
185static gc_level_t btree_block_level(struct logfs_block *block)
186{
187 return expand_level(block->ino, block->level);
188}
189
190static struct logfs_block_ops btree_block_ops = { 186static struct logfs_block_ops btree_block_ops = {
191 .write_block = btree_write_block, 187 .write_block = btree_write_block,
192 .block_level = btree_block_level,
193 .free_block = __free_block, 188 .free_block = __free_block,
194 .write_alias = btree_write_alias, 189 .write_alias = btree_write_alias,
195}; 190};
@@ -918,7 +913,7 @@ err:
918 for (i--; i >= 0; i--) 913 for (i--; i >= 0; i--)
919 free_area(super->s_area[i]); 914 free_area(super->s_area[i]);
920 free_area(super->s_journal_area); 915 free_area(super->s_journal_area);
921 mempool_destroy(super->s_alias_pool); 916 logfs_mempool_destroy(super->s_alias_pool);
922 return -ENOMEM; 917 return -ENOMEM;
923} 918}
924 919