diff options
Diffstat (limited to 'fs/nilfs2/bmap.c')
-rw-r--r-- | fs/nilfs2/bmap.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/fs/nilfs2/bmap.c b/fs/nilfs2/bmap.c index cf5c5d2cfa0..de67d2a1251 100644 --- a/fs/nilfs2/bmap.c +++ b/fs/nilfs2/bmap.c | |||
@@ -101,8 +101,7 @@ static int nilfs_bmap_do_insert(struct nilfs_bmap *bmap, __u64 key, __u64 ptr) | |||
101 | if (n < 0) | 101 | if (n < 0) |
102 | return n; | 102 | return n; |
103 | ret = nilfs_btree_convert_and_insert( | 103 | ret = nilfs_btree_convert_and_insert( |
104 | bmap, key, ptr, keys, ptrs, n, | 104 | bmap, key, ptr, keys, ptrs, n); |
105 | NILFS_BMAP_LARGE_LOW, NILFS_BMAP_LARGE_HIGH); | ||
106 | if (ret == 0) | 105 | if (ret == 0) |
107 | bmap->b_u.u_flags |= NILFS_BMAP_LARGE; | 106 | bmap->b_u.u_flags |= NILFS_BMAP_LARGE; |
108 | 107 | ||
@@ -158,8 +157,7 @@ static int nilfs_bmap_do_delete(struct nilfs_bmap *bmap, __u64 key) | |||
158 | if (n < 0) | 157 | if (n < 0) |
159 | return n; | 158 | return n; |
160 | ret = nilfs_direct_delete_and_convert( | 159 | ret = nilfs_direct_delete_and_convert( |
161 | bmap, key, keys, ptrs, n, | 160 | bmap, key, keys, ptrs, n); |
162 | NILFS_BMAP_SMALL_LOW, NILFS_BMAP_SMALL_HIGH); | ||
163 | if (ret == 0) | 161 | if (ret == 0) |
164 | bmap->b_u.u_flags &= ~NILFS_BMAP_LARGE; | 162 | bmap->b_u.u_flags &= ~NILFS_BMAP_LARGE; |
165 | 163 | ||
@@ -681,12 +679,7 @@ int nilfs_bmap_read(struct nilfs_bmap *bmap, struct nilfs_inode *raw_inode) | |||
681 | } | 679 | } |
682 | 680 | ||
683 | return (bmap->b_u.u_flags & NILFS_BMAP_LARGE) ? | 681 | return (bmap->b_u.u_flags & NILFS_BMAP_LARGE) ? |
684 | nilfs_btree_init(bmap, | 682 | nilfs_btree_init(bmap) : nilfs_direct_init(bmap); |
685 | NILFS_BMAP_LARGE_LOW, | ||
686 | NILFS_BMAP_LARGE_HIGH) : | ||
687 | nilfs_direct_init(bmap, | ||
688 | NILFS_BMAP_SMALL_LOW, | ||
689 | NILFS_BMAP_SMALL_HIGH); | ||
690 | } | 683 | } |
691 | 684 | ||
692 | /** | 685 | /** |