diff options
Diffstat (limited to 'fs/logfs')
-rw-r--r-- | fs/logfs/logfs.h | 1 | ||||
-rw-r--r-- | fs/logfs/readwrite.c | 21 | ||||
-rw-r--r-- | fs/logfs/segment.c | 6 |
3 files changed, 0 insertions, 28 deletions
diff --git a/fs/logfs/logfs.h b/fs/logfs/logfs.h index b84b0eec6024..97195b9e93a5 100644 --- a/fs/logfs/logfs.h +++ b/fs/logfs/logfs.h | |||
@@ -305,7 +305,6 @@ typedef int write_alias_t(struct super_block *sb, u64 ino, u64 bix, | |||
305 | level_t level, int child_no, __be64 val); | 305 | level_t level, int child_no, __be64 val); |
306 | struct logfs_block_ops { | 306 | struct logfs_block_ops { |
307 | void (*write_block)(struct logfs_block *block); | 307 | void (*write_block)(struct logfs_block *block); |
308 | gc_level_t (*block_level)(struct logfs_block *block); | ||
309 | void (*free_block)(struct super_block *sb, struct logfs_block*block); | 308 | void (*free_block)(struct super_block *sb, struct logfs_block*block); |
310 | int (*write_alias)(struct super_block *sb, | 309 | int (*write_alias)(struct super_block *sb, |
311 | struct logfs_block *block, | 310 | struct logfs_block *block, |
diff --git a/fs/logfs/readwrite.c b/fs/logfs/readwrite.c index c3a3a6814b84..3659c37fbd72 100644 --- a/fs/logfs/readwrite.c +++ b/fs/logfs/readwrite.c | |||
@@ -429,25 +429,6 @@ static void inode_write_block(struct logfs_block *block) | |||
429 | } | 429 | } |
430 | } | 430 | } |
431 | 431 | ||
432 | static gc_level_t inode_block_level(struct logfs_block *block) | ||
433 | { | ||
434 | BUG_ON(block->inode->i_ino == LOGFS_INO_MASTER); | ||
435 | return GC_LEVEL(LOGFS_MAX_LEVELS); | ||
436 | } | ||
437 | |||
438 | static gc_level_t indirect_block_level(struct logfs_block *block) | ||
439 | { | ||
440 | struct page *page; | ||
441 | struct inode *inode; | ||
442 | u64 bix; | ||
443 | level_t level; | ||
444 | |||
445 | page = block->page; | ||
446 | inode = page->mapping->host; | ||
447 | logfs_unpack_index(page->index, &bix, &level); | ||
448 | return expand_level(inode->i_ino, level); | ||
449 | } | ||
450 | |||
451 | /* | 432 | /* |
452 | * This silences a false, yet annoying gcc warning. I hate it when my editor | 433 | * This silences a false, yet annoying gcc warning. I hate it when my editor |
453 | * jumps into bitops.h each time I recompile this file. | 434 | * jumps into bitops.h each time I recompile this file. |
@@ -586,14 +567,12 @@ static void indirect_free_block(struct super_block *sb, | |||
586 | 567 | ||
587 | static struct logfs_block_ops inode_block_ops = { | 568 | static struct logfs_block_ops inode_block_ops = { |
588 | .write_block = inode_write_block, | 569 | .write_block = inode_write_block, |
589 | .block_level = inode_block_level, | ||
590 | .free_block = inode_free_block, | 570 | .free_block = inode_free_block, |
591 | .write_alias = inode_write_alias, | 571 | .write_alias = inode_write_alias, |
592 | }; | 572 | }; |
593 | 573 | ||
594 | struct logfs_block_ops indirect_block_ops = { | 574 | struct logfs_block_ops indirect_block_ops = { |
595 | .write_block = indirect_write_block, | 575 | .write_block = indirect_write_block, |
596 | .block_level = indirect_block_level, | ||
597 | .free_block = indirect_free_block, | 576 | .free_block = indirect_free_block, |
598 | .write_alias = indirect_write_alias, | 577 | .write_alias = indirect_write_alias, |
599 | }; | 578 | }; |
diff --git a/fs/logfs/segment.c b/fs/logfs/segment.c index 0ecd8f07c11e..02db22ebbf13 100644 --- a/fs/logfs/segment.c +++ b/fs/logfs/segment.c | |||
@@ -182,14 +182,8 @@ static int btree_write_alias(struct super_block *sb, struct logfs_block *block, | |||
182 | return 0; | 182 | return 0; |
183 | } | 183 | } |
184 | 184 | ||
185 | static gc_level_t btree_block_level(struct logfs_block *block) | ||
186 | { | ||
187 | return expand_level(block->ino, block->level); | ||
188 | } | ||
189 | |||
190 | static struct logfs_block_ops btree_block_ops = { | 185 | static struct logfs_block_ops btree_block_ops = { |
191 | .write_block = btree_write_block, | 186 | .write_block = btree_write_block, |
192 | .block_level = btree_block_level, | ||
193 | .free_block = __free_block, | 187 | .free_block = __free_block, |
194 | .write_alias = btree_write_alias, | 188 | .write_alias = btree_write_alias, |
195 | }; | 189 | }; |