ocfs2: use all extent block suballocators
authorMark Fasheh <mark.fasheh@oracle.com>
Mon, 25 Jun 2007 21:53:33 +0000 (14:53 -0700)
committerMark Fasheh <mark.fasheh@oracle.com>
Wed, 11 Jul 2007 00:31:56 +0000 (17:31 -0700)
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>
fs/ocfs2/alloc.c
fs/ocfs2/suballoc.c

index 26e867087e956ffa7603c287f911b54b6e1481d8..b5327b4cdb34aa34b9714ceb1d149412e02877be 100644 (file)
@@ -386,13 +386,7 @@ static int ocfs2_create_new_meta_bhs(struct ocfs2_super *osb,
                        strcpy(eb->h_signature, OCFS2_EXTENT_BLOCK_SIGNATURE);
                        eb->h_blkno = cpu_to_le64(first_blkno);
                        eb->h_fs_generation = cpu_to_le32(osb->fs_generation);
-
-#ifndef OCFS2_USE_ALL_METADATA_SUBALLOCATORS
-                       /* we always use slot zero's suballocator */
-                       eb->h_suballoc_slot = 0;
-#else
                        eb->h_suballoc_slot = cpu_to_le16(osb->slot_num);
-#endif
                        eb->h_suballoc_bit = cpu_to_le16(suballoc_bit_start);
                        eb->h_list.l_count =
                                cpu_to_le16(ocfs2_extent_recs_per_eb(osb->sb));
index 82bf12f887a6d2004575979f51167fd80ea3a344..d9c5c9fcb30fc300bb9132f54f0526156f5847b8 100644 (file)
@@ -488,13 +488,7 @@ int ocfs2_reserve_new_metadata(struct ocfs2_super *osb,
 
        (*ac)->ac_bits_wanted = ocfs2_extend_meta_needed(fe);
        (*ac)->ac_which = OCFS2_AC_USE_META;
-
-#ifndef OCFS2_USE_ALL_METADATA_SUBALLOCATORS
-       slot = 0;
-#else
        slot = osb->slot_num;
-#endif
-
        (*ac)->ac_group_search = ocfs2_block_group_search;
 
        status = ocfs2_reserve_suballoc_bits(osb, (*ac),