diff options
Diffstat (limited to 'fs/ext4/ext4.h')
-rw-r--r-- | fs/ext4/ext4.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 66946aa62127..b681d90b1e87 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h | |||
@@ -158,7 +158,6 @@ struct ext4_allocation_request { | |||
158 | #define EXT4_MAP_MAPPED (1 << BH_Mapped) | 158 | #define EXT4_MAP_MAPPED (1 << BH_Mapped) |
159 | #define EXT4_MAP_UNWRITTEN (1 << BH_Unwritten) | 159 | #define EXT4_MAP_UNWRITTEN (1 << BH_Unwritten) |
160 | #define EXT4_MAP_BOUNDARY (1 << BH_Boundary) | 160 | #define EXT4_MAP_BOUNDARY (1 << BH_Boundary) |
161 | #define EXT4_MAP_UNINIT (1 << BH_Uninit) | ||
162 | /* Sometimes (in the bigalloc case, from ext4_da_get_block_prep) the caller of | 161 | /* Sometimes (in the bigalloc case, from ext4_da_get_block_prep) the caller of |
163 | * ext4_map_blocks wants to know whether or not the underlying cluster has | 162 | * ext4_map_blocks wants to know whether or not the underlying cluster has |
164 | * already been accounted for. EXT4_MAP_FROM_CLUSTER conveys to the caller that | 163 | * already been accounted for. EXT4_MAP_FROM_CLUSTER conveys to the caller that |
@@ -169,7 +168,7 @@ struct ext4_allocation_request { | |||
169 | #define EXT4_MAP_FROM_CLUSTER (1 << BH_AllocFromCluster) | 168 | #define EXT4_MAP_FROM_CLUSTER (1 << BH_AllocFromCluster) |
170 | #define EXT4_MAP_FLAGS (EXT4_MAP_NEW | EXT4_MAP_MAPPED |\ | 169 | #define EXT4_MAP_FLAGS (EXT4_MAP_NEW | EXT4_MAP_MAPPED |\ |
171 | EXT4_MAP_UNWRITTEN | EXT4_MAP_BOUNDARY |\ | 170 | EXT4_MAP_UNWRITTEN | EXT4_MAP_BOUNDARY |\ |
172 | EXT4_MAP_UNINIT | EXT4_MAP_FROM_CLUSTER) | 171 | EXT4_MAP_FROM_CLUSTER) |
173 | 172 | ||
174 | struct ext4_map_blocks { | 173 | struct ext4_map_blocks { |
175 | ext4_fsblk_t m_pblk; | 174 | ext4_fsblk_t m_pblk; |
@@ -2784,10 +2783,9 @@ extern int ext4_mmp_csum_verify(struct super_block *sb, | |||
2784 | * See EXT4_MAP_... to see where this is used. | 2783 | * See EXT4_MAP_... to see where this is used. |
2785 | */ | 2784 | */ |
2786 | enum ext4_state_bits { | 2785 | enum ext4_state_bits { |
2787 | BH_Uninit /* blocks are allocated but uninitialized on disk */ | 2786 | BH_AllocFromCluster /* allocated blocks were part of already |
2788 | = BH_JBDPrivateStart, | ||
2789 | BH_AllocFromCluster, /* allocated blocks were part of already | ||
2790 | * allocated cluster. */ | 2787 | * allocated cluster. */ |
2788 | = BH_JBDPrivateStart | ||
2791 | }; | 2789 | }; |
2792 | 2790 | ||
2793 | /* | 2791 | /* |