aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorMark Fasheh <mark.fasheh@oracle.com>2007-06-25 17:53:33 -0400
committerMark Fasheh <mark.fasheh@oracle.com>2007-07-10 20:31:56 -0400
commit1f6697d072e6fd0b332a4301c21060dcb89bd623 (patch)
tree26fd1121b851433856ee128810ab425408b19f4f /fs
parent59a5e416d1ab543a5248a2b34d83202c4d55d132 (diff)
ocfs2: use all extent block suballocators
Now that we have a method to deallocate blocks from them, each node should allocate extent blocks from their local suballocator file. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/ocfs2/alloc.c6
-rw-r--r--fs/ocfs2/suballoc.c6
2 files changed, 0 insertions, 12 deletions
diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index 26e867087e95..b5327b4cdb34 100644
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
@@ -386,13 +386,7 @@ static int ocfs2_create_new_meta_bhs(struct ocfs2_super *osb,
386 strcpy(eb->h_signature, OCFS2_EXTENT_BLOCK_SIGNATURE); 386 strcpy(eb->h_signature, OCFS2_EXTENT_BLOCK_SIGNATURE);
387 eb->h_blkno = cpu_to_le64(first_blkno); 387 eb->h_blkno = cpu_to_le64(first_blkno);
388 eb->h_fs_generation = cpu_to_le32(osb->fs_generation); 388 eb->h_fs_generation = cpu_to_le32(osb->fs_generation);
389
390#ifndef OCFS2_USE_ALL_METADATA_SUBALLOCATORS
391 /* we always use slot zero's suballocator */
392 eb->h_suballoc_slot = 0;
393#else
394 eb->h_suballoc_slot = cpu_to_le16(osb->slot_num); 389 eb->h_suballoc_slot = cpu_to_le16(osb->slot_num);
395#endif
396 eb->h_suballoc_bit = cpu_to_le16(suballoc_bit_start); 390 eb->h_suballoc_bit = cpu_to_le16(suballoc_bit_start);
397 eb->h_list.l_count = 391 eb->h_list.l_count =
398 cpu_to_le16(ocfs2_extent_recs_per_eb(osb->sb)); 392 cpu_to_le16(ocfs2_extent_recs_per_eb(osb->sb));
diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
index 82bf12f887a6..d9c5c9fcb30f 100644
--- a/fs/ocfs2/suballoc.c
+++ b/fs/ocfs2/suballoc.c
@@ -488,13 +488,7 @@ int ocfs2_reserve_new_metadata(struct ocfs2_super *osb,
488 488
489 (*ac)->ac_bits_wanted = ocfs2_extend_meta_needed(fe); 489 (*ac)->ac_bits_wanted = ocfs2_extend_meta_needed(fe);
490 (*ac)->ac_which = OCFS2_AC_USE_META; 490 (*ac)->ac_which = OCFS2_AC_USE_META;
491
492#ifndef OCFS2_USE_ALL_METADATA_SUBALLOCATORS
493 slot = 0;
494#else
495 slot = osb->slot_num; 491 slot = osb->slot_num;
496#endif
497
498 (*ac)->ac_group_search = ocfs2_block_group_search; 492 (*ac)->ac_group_search = ocfs2_block_group_search;
499 493
500 status = ocfs2_reserve_suballoc_bits(osb, (*ac), 494 status = ocfs2_reserve_suballoc_bits(osb, (*ac),