Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3a326a6 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Theodore Ts'o
Browse files

ext4: cleanup mballoc header files 



Move some of the forward declaration of the static functions
to mballoc.c where they are used. This enables us to include
mballoc.h in other .c files. Also correct the buddy cache
documentation.

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 920313a7

fs/ext4/mballoc.c

+19 −4
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ 
 * inode as:

 *

 *  {                        page                        }

 *  [ group 0 buddy][ group 0 bitmap] [group 1][ group 1]...

 *  [ group 0 bitmap][ group 0 buddy] [group 1][ group 1]...

 *

 *

 * one block each for bitmap and buddy information.  So for each group we
@@ -330,6 +330,16 @@ 
 *        object

 *

 */

static struct kmem_cache *ext4_pspace_cachep;

static struct kmem_cache *ext4_ac_cachep;

static struct kmem_cache *ext4_free_ext_cachep;

static void ext4_mb_generate_from_pa(struct super_block *sb, void *bitmap,

					ext4_group_t group);

static int ext4_mb_init_per_dev_proc(struct super_block *sb);

static int ext4_mb_destroy_per_dev_proc(struct super_block *sb);

static void release_blocks_on_commit(journal_t *journal, transaction_t *txn);







static inline void *mb_correct_addr_and_bit(int *bit, void *addr)

{
@@ -716,7 +726,7 @@ static void ext4_mb_generate_buddy(struct super_block *sb, 
 * stored in the inode as

 *

 * {                        page                        }

 * [ group 0 buddy][ group 0 bitmap] [group 1][ group 1]...

 * [ group 0 bitmap][ group 0 buddy] [group 1][ group 1]...

 *

 *

 * one block each for bitmap and buddy information.
@@ -1322,8 +1332,13 @@ static void ext4_mb_use_best_found(struct ext4_allocation_context *ac, 
	ac->ac_tail = ret & 0xffff;

	ac->ac_buddy = ret >> 16;



	/* XXXXXXX: SUCH A HORRIBLE **CK */

	/*FIXME!! Why ? */

	/*

	 * take the page reference. We want the page to be pinned

	 * so that we don't get a ext4_mb_init_cache_call for this

	 * group until we update the bitmap. That would mean we

	 * double allocate blocks. The reference is dropped

	 * in ext4_mb_release_context

	 */

	ac->ac_bitmap_page = e4b->bd_bitmap_page;

	get_page(ac->ac_bitmap_page);

	ac->ac_buddy_page = e4b->bd_buddy_page;

fs/ext4/mballoc.h

+1 −17
Original line number Diff line number Diff line
@@ -99,9 +99,6 @@ 
 */

#define MB_DEFAULT_GROUP_PREALLOC	512



static struct kmem_cache *ext4_pspace_cachep;

static struct kmem_cache *ext4_ac_cachep;

static struct kmem_cache *ext4_free_ext_cachep;



struct ext4_free_data {

	/* this links the free block information from group_info */
@@ -262,25 +259,12 @@ static inline void ext4_mb_store_history(struct ext4_allocation_context *ac) 
{

	return;

}

#else

static void ext4_mb_store_history(struct ext4_allocation_context *ac);

#endif



#define in_range(b, first, len)	((b) >= (first) && (b) <= (first) + (len) - 1)



struct buffer_head *read_block_bitmap(struct super_block *, ext4_group_t);



static void ext4_mb_generate_from_pa(struct super_block *sb, void *bitmap,

					ext4_group_t group);

static void ext4_mb_return_to_preallocation(struct inode *inode,

					struct ext4_buddy *e4b, sector_t block,

					int count);

static void ext4_mb_put_pa(struct ext4_allocation_context *,

			struct super_block *, struct ext4_prealloc_space *pa);

static int ext4_mb_init_per_dev_proc(struct super_block *sb);

static int ext4_mb_destroy_per_dev_proc(struct super_block *sb);

static void release_blocks_on_commit(journal_t *journal, transaction_t *txn);





static inline void ext4_lock_group(struct super_block *sb, ext4_group_t group)

{
@@ -306,7 +290,7 @@ static inline int ext4_is_group_locked(struct super_block *sb, 
						&(grinfo->bb_state));

}



static ext4_fsblk_t ext4_grp_offs_to_block(struct super_block *sb,

static inline ext4_fsblk_t ext4_grp_offs_to_block(struct super_block *sb,

					struct ext4_free_extent *fex)

{

	ext4_fsblk_t block;