Changeset 6accc5cf in mainline for uspace/lib/ext4/libext4_balloc.c
- Timestamp:
- 2015-07-28T14:12:56Z (9 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- b10460a
- Parents:
- 47726b5e (diff), fb4d788 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/ext4/libext4_balloc.c
r47726b5e r6accc5cf 39 39 #include "libext4.h" 40 40 41 /** Compute number of block group from block address.42 *43 * @param sb Superblock pointer.44 * @param block_addr Absolute address of block.45 *46 * @return Block group index47 *48 */49 static uint32_t ext4_balloc_get_bgid_of_block(ext4_superblock_t *sb,50 uint32_t block_addr)51 {52 uint32_t blocks_per_group =53 ext4_superblock_get_blocks_per_group(sb);54 uint32_t first_block =55 ext4_superblock_get_first_data_block(sb);56 57 /* First block == 0 or 1 */58 if (first_block == 0)59 return block_addr / blocks_per_group;60 else61 return (block_addr - 1) / blocks_per_group;62 }63 64 41 /** Free block. 65 42 * … … 76 53 77 54 /* Compute indexes */ 78 uint32_t block_group = ext4_ balloc_get_bgid_of_block(sb, block_addr);55 uint32_t block_group = ext4_filesystem_blockaddr2group(sb, block_addr); 79 56 uint32_t index_in_group = 80 57 ext4_filesystem_blockaddr2_index_in_group(sb, block_addr); … … 135 112 } 136 113 137 /** Free continuous set of blocks. 138 * 139 * @param inode_ref Inode, where the blocks are allocated 140 * @param first First block to release 141 * @param count Number of blocks to release 142 * 143 */ 144 int ext4_balloc_free_blocks(ext4_inode_ref_t *inode_ref, 114 static int ext4_balloc_free_blocks_internal(ext4_inode_ref_t *inode_ref, 145 115 uint32_t first, uint32_t count) 146 116 { 147 117 ext4_filesystem_t *fs = inode_ref->fs; 148 118 ext4_superblock_t *sb = fs->superblock; 149 119 150 120 /* Compute indexes */ 151 uint32_t block_group_first = 152 ext4_balloc_get_bgid_of_block(sb,first);153 uint32_t block_group_last = 154 ext4_balloc_get_bgid_of_block(sb,first + count - 1);155 121 uint32_t block_group_first = ext4_filesystem_blockaddr2group(sb, 122 first); 123 uint32_t block_group_last = ext4_filesystem_blockaddr2group(sb, 124 first + count - 1); 125 156 126 assert(block_group_first == block_group_last); 157 127 158 128 /* Load block group reference */ 159 129 ext4_block_group_ref_t *bg_ref; … … 161 131 if (rc != EOK) 162 132 return rc; 163 133 164 134 uint32_t index_in_group_first = 165 135 ext4_filesystem_blockaddr2_index_in_group(sb, first); 166 136 167 137 /* Load block with bitmap */ 168 138 uint32_t bitmap_block_addr = 169 139 ext4_block_group_get_block_bitmap(bg_ref->block_group, sb); 170 140 171 141 block_t *bitmap_block; 172 142 rc = block_get(&bitmap_block, fs->device, bitmap_block_addr, 0); … … 175 145 return rc; 176 146 } 177 147 178 148 /* Modify bitmap */ 179 149 ext4_bitmap_free_bits(bitmap_block->data, index_in_group_first, count); 180 150 bitmap_block->dirty = true; 181 151 182 152 /* Release block with bitmap */ 183 153 rc = block_put(bitmap_block); … … 187 157 return rc; 188 158 } 189 159 190 160 uint32_t block_size = ext4_superblock_get_block_size(sb); 191 161 192 162 /* Update superblock free blocks count */ 193 163 uint32_t sb_free_blocks = … … 195 165 sb_free_blocks += count; 196 166 ext4_superblock_set_free_blocks_count(sb, sb_free_blocks); 197 167 198 168 /* Update inode blocks count */ 199 169 uint64_t ino_blocks = … … 202 172 ext4_inode_set_blocks_count(sb, inode_ref->inode, ino_blocks); 203 173 inode_ref->dirty = true; 204 174 205 175 /* Update block group free blocks count */ 206 176 uint32_t free_blocks = … … 210 180 sb, free_blocks); 211 181 bg_ref->dirty = true; 212 182 213 183 /* Release block group reference */ 214 184 return ext4_filesystem_put_block_group_ref(bg_ref); 215 185 } 216 186 187 /** Free continuous set of blocks. 188 * 189 * @param inode_ref Inode, where the blocks are allocated 190 * @param first First block to release 191 * @param count Number of blocks to release 192 * 193 */ 194 int ext4_balloc_free_blocks(ext4_inode_ref_t *inode_ref, 195 uint32_t first, uint32_t count) 196 { 197 int r; 198 uint32_t gid; 199 uint64_t limit; 200 ext4_filesystem_t *fs = inode_ref->fs; 201 ext4_superblock_t *sb = fs->superblock; 202 203 while (count) { 204 gid = ext4_filesystem_blockaddr2group(sb, first); 205 limit = ext4_filesystem_index_in_group2blockaddr(sb, 0, 206 gid + 1); 207 208 if ((first + count) >= limit) { 209 /* This extent spans over 2 or more block groups, 210 * we'll break it into smaller parts. 211 */ 212 uint32_t s = limit - first; 213 214 r = ext4_balloc_free_blocks_internal(inode_ref, 215 first, s); 216 if (r != EOK) 217 return r; 218 219 first = limit; 220 count -= s; 221 } else { 222 return ext4_balloc_free_blocks_internal(inode_ref, 223 first, count); 224 } 225 } 226 227 return EOK; 228 } 229 217 230 /** Compute first block for data in block group. 218 231 * … … 227 240 ext4_block_group_ref_t *bg_ref) 228 241 { 229 uint32_t block_group_count = ext4_superblock_get_block_group_count(sb); 230 uint32_t inode_table_first_block = 231 ext4_block_group_get_inode_table_first_block(bg_ref->block_group, sb); 232 uint16_t inode_table_item_size = ext4_superblock_get_inode_size(sb); 233 uint32_t inodes_per_group = ext4_superblock_get_inodes_per_group(sb); 234 uint32_t block_size = ext4_superblock_get_block_size(sb); 235 uint32_t inode_table_bytes; 236 237 if (bg_ref->index < block_group_count - 1) { 238 inode_table_bytes = inodes_per_group * inode_table_item_size; 239 } else { 240 /* Last block group could be smaller */ 241 uint32_t inodes_count_total = ext4_superblock_get_inodes_count(sb); 242 inode_table_bytes = 243 (inodes_count_total - ((block_group_count - 1) * inodes_per_group)) * 244 inode_table_item_size; 245 } 246 247 uint32_t inode_table_blocks = inode_table_bytes / block_size; 248 249 if (inode_table_bytes % block_size) 250 inode_table_blocks++; 251 252 return inode_table_first_block + inode_table_blocks; 242 uint32_t r; 243 uint64_t itable = ext4_block_group_get_inode_table_first_block( 244 bg_ref->block_group, sb); 245 uint32_t itable_sz = ext4_filesystem_bg_get_itable_size(sb, bg_ref); 246 247 if (!ext4_superblock_has_feature_incompatible(sb, 248 EXT4_FEATURE_INCOMPAT_FLEX_BG)) { 249 /* If we are not using FLEX_BG, the first data block 250 * is always after the inode table. 251 */ 252 r = itable + itable_sz; 253 return ext4_filesystem_blockaddr2_index_in_group(sb, r); 254 } 255 256 uint64_t bbmap = ext4_block_group_get_block_bitmap(bg_ref->block_group, 257 sb); 258 uint64_t ibmap = ext4_block_group_get_inode_bitmap(bg_ref->block_group, 259 sb); 260 261 r = ext4_filesystem_index_in_group2blockaddr(sb, 0, bg_ref->index); 262 r += ext4_filesystem_bg_get_backup_blocks(bg_ref); 263 264 if (ext4_filesystem_blockaddr2group(sb, bbmap) != bg_ref->index) 265 bbmap = -1; /* Invalid */ 266 267 if (ext4_filesystem_blockaddr2group(sb, ibmap) != bg_ref->index) 268 ibmap = -1; 269 270 while (1) { 271 if (r == bbmap || r == ibmap) 272 r++; 273 else if (r >= itable && r < (itable + itable_sz)) 274 r = itable + itable_sz; 275 else 276 break; 277 } 278 279 return r; 253 280 } 254 281 … … 264 291 *goal = 0; 265 292 ext4_superblock_t *sb = inode_ref->fs->superblock; 266 293 267 294 uint64_t inode_size = ext4_inode_get_size(sb, inode_ref->inode); 268 295 uint32_t block_size = ext4_superblock_get_block_size(sb); 269 296 uint32_t inode_block_count = inode_size / block_size; 270 297 271 298 if (inode_size % block_size != 0) 272 299 inode_block_count++; 273 300 274 301 /* If inode has some blocks, get last block address + 1 */ 275 302 if (inode_block_count > 0) { … … 278 305 if (rc != EOK) 279 306 return rc; 280 307 281 308 if (goal != 0) { 282 309 (*goal)++; 283 310 return EOK; 284 311 } 285 286 312 /* If goal == 0, sparse file -> continue */ 287 313 } 288 314 289 315 /* Identify block group of inode */ 290 316 uint32_t inodes_per_group = ext4_superblock_get_inodes_per_group(sb); 291 317 uint32_t block_group = (inode_ref->index - 1) / inodes_per_group; 292 block_size = ext4_superblock_get_block_size(sb); 293 318 294 319 /* Load block group reference */ 295 320 ext4_block_group_ref_t *bg_ref; … … 298 323 if (rc != EOK) 299 324 return rc; 300 301 /* Compute indexes */ 302 uint32_t block_group_count = ext4_superblock_get_block_group_count(sb); 303 uint32_t inode_table_first_block = 304 ext4_block_group_get_inode_table_first_block(bg_ref->block_group, sb); 305 uint16_t inode_table_item_size = ext4_superblock_get_inode_size(sb); 306 uint32_t inode_table_bytes; 307 308 /* Check for last block group */ 309 if (block_group < block_group_count - 1) { 310 inode_table_bytes = inodes_per_group * inode_table_item_size; 311 } else { 312 /* Last block group could be smaller */ 313 uint32_t inodes_count_total = ext4_superblock_get_inodes_count(sb); 314 inode_table_bytes = 315 (inodes_count_total - ((block_group_count - 1) * inodes_per_group)) * 316 inode_table_item_size; 317 } 318 319 uint32_t inode_table_blocks = inode_table_bytes / block_size; 320 321 if (inode_table_bytes % block_size) 322 inode_table_blocks++; 323 324 *goal = inode_table_first_block + inode_table_blocks; 325 325 326 *goal = ext4_balloc_get_first_data_block_in_group(sb, bg_ref); 327 326 328 return ext4_filesystem_put_block_group_ref(bg_ref); 327 329 } … … 353 355 354 356 /* Load block group number for goal and relative index */ 355 uint32_t block_group = ext4_ balloc_get_bgid_of_block(sb, goal);357 uint32_t block_group = ext4_filesystem_blockaddr2group(sb, goal); 356 358 uint32_t index_in_group = 357 359 ext4_filesystem_blockaddr2_index_in_group(sb, goal); … … 626 628 627 629 /* Compute indexes */ 628 uint32_t block_group = ext4_ balloc_get_bgid_of_block(sb, fblock);630 uint32_t block_group = ext4_filesystem_blockaddr2group(sb, fblock); 629 631 uint32_t index_in_group = 630 632 ext4_filesystem_blockaddr2_index_in_group(sb, fblock);
Note:
See TracChangeset
for help on using the changeset viewer.