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

Commit b89c5428 authored by Tiger Yang's avatar Tiger Yang Committed by Joel Becker
Browse files

ocfs2: add extent block stealing for ocfs2 v5 



This patch add extent block (metadata) stealing mechanism for
extent allocation. This mechanism is same as the inode stealing.
if no room in slot specific extent_alloc, we will try to
allocate extent block from the next slot.

Signed-off-by: default avatarTiger Yang <tiger.yang@oracle.com>
Acked-by: default avatarTao Ma <tao.ma@oracle.com>
Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
parent a5f28ae4

fs/ocfs2/alloc.c

+3 −2
Original line number Diff line number Diff line
@@ -1050,7 +1050,8 @@ static int ocfs2_create_new_meta_bhs(handle_t *handle, 
			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);

			eb->h_suballoc_slot = cpu_to_le16(osb->slot_num);

			eb->h_suballoc_slot =

				cpu_to_le16(meta_ac->ac_alloc_slot);

			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));
@@ -6037,7 +6038,7 @@ static void ocfs2_truncate_log_worker(struct work_struct *work) 
	if (status < 0)

		mlog_errno(status);

	else

		ocfs2_init_inode_steal_slot(osb);

		ocfs2_init_steal_slots(osb);



	mlog_exit(status);

}

fs/ocfs2/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -2439,7 +2439,7 @@ static int ocfs2_dx_dir_attach_index(struct ocfs2_super *osb, 
	dx_root = (struct ocfs2_dx_root_block *)dx_root_bh->b_data;

	memset(dx_root, 0, osb->sb->s_blocksize);

	strcpy(dx_root->dr_signature, OCFS2_DX_ROOT_SIGNATURE);

	dx_root->dr_suballoc_slot = cpu_to_le16(osb->slot_num);

	dx_root->dr_suballoc_slot = cpu_to_le16(meta_ac->ac_alloc_slot);

	dx_root->dr_suballoc_bit = cpu_to_le16(dr_suballoc_bit);

	dx_root->dr_fs_generation = cpu_to_le32(osb->fs_generation);

	dx_root->dr_blkno = cpu_to_le64(dr_blkno);

fs/ocfs2/localalloc.c

+1 −1
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ out_mutex: 


out:

	if (!status)

		ocfs2_init_inode_steal_slot(osb);

		ocfs2_init_steal_slots(osb);

	mlog_exit(status);

	return status;

}

fs/ocfs2/ocfs2.h

+2 −27
Original line number Diff line number Diff line
@@ -305,7 +305,9 @@ struct ocfs2_super 
	u32 s_next_generation;

	unsigned long osb_flags;

	s16 s_inode_steal_slot;

	s16 s_meta_steal_slot;

	atomic_t s_num_inodes_stolen;

	atomic_t s_num_meta_stolen;



	unsigned long s_mount_opt;

	unsigned int s_atime_quantum;
@@ -760,33 +762,6 @@ static inline unsigned int ocfs2_megabytes_to_clusters(struct super_block *sb, 
	return megs << (20 - OCFS2_SB(sb)->s_clustersize_bits);

}



static inline void ocfs2_init_inode_steal_slot(struct ocfs2_super *osb)

{

	spin_lock(&osb->osb_lock);

	osb->s_inode_steal_slot = OCFS2_INVALID_SLOT;

	spin_unlock(&osb->osb_lock);

	atomic_set(&osb->s_num_inodes_stolen, 0);

}



static inline void ocfs2_set_inode_steal_slot(struct ocfs2_super *osb,

					      s16 slot)

{

	spin_lock(&osb->osb_lock);

	osb->s_inode_steal_slot = slot;

	spin_unlock(&osb->osb_lock);

}



static inline s16 ocfs2_get_inode_steal_slot(struct ocfs2_super *osb)

{

	s16 slot;



	spin_lock(&osb->osb_lock);

	slot = osb->s_inode_steal_slot;

	spin_unlock(&osb->osb_lock);



	return slot;

}



#define ocfs2_set_bit ext2_set_bit

#define ocfs2_clear_bit ext2_clear_bit

#define ocfs2_test_bit ext2_test_bit

fs/ocfs2/refcounttree.c

+3 −3
Original line number Diff line number Diff line
@@ -626,7 +626,7 @@ static int ocfs2_create_refcount_tree(struct inode *inode, 
	rb = (struct ocfs2_refcount_block *)new_bh->b_data;

	memset(rb, 0, inode->i_sb->s_blocksize);

	strcpy((void *)rb, OCFS2_REFCOUNT_BLOCK_SIGNATURE);

	rb->rf_suballoc_slot = cpu_to_le16(osb->slot_num);

	rb->rf_suballoc_slot = cpu_to_le16(meta_ac->ac_alloc_slot);

	rb->rf_suballoc_bit = cpu_to_le16(suballoc_bit_start);

	rb->rf_fs_generation = cpu_to_le32(osb->fs_generation);

	rb->rf_blkno = cpu_to_le64(first_blkno);
@@ -1330,7 +1330,7 @@ static int ocfs2_expand_inline_ref_root(handle_t *handle, 
	memcpy(new_bh->b_data, ref_root_bh->b_data, sb->s_blocksize);



	new_rb = (struct ocfs2_refcount_block *)new_bh->b_data;

	new_rb->rf_suballoc_slot = cpu_to_le16(OCFS2_SB(sb)->slot_num);

	new_rb->rf_suballoc_slot = cpu_to_le16(meta_ac->ac_alloc_slot);

	new_rb->rf_suballoc_bit = cpu_to_le16(suballoc_bit_start);

	new_rb->rf_blkno = cpu_to_le64(blkno);

	new_rb->rf_cpos = cpu_to_le32(0);
@@ -1576,7 +1576,7 @@ static int ocfs2_new_leaf_refcount_block(handle_t *handle, 
	new_rb = (struct ocfs2_refcount_block *)new_bh->b_data;

	memset(new_rb, 0, sb->s_blocksize);

	strcpy((void *)new_rb, OCFS2_REFCOUNT_BLOCK_SIGNATURE);

	new_rb->rf_suballoc_slot = cpu_to_le16(OCFS2_SB(sb)->slot_num);

	new_rb->rf_suballoc_slot = cpu_to_le16(meta_ac->ac_alloc_slot);

	new_rb->rf_suballoc_bit = cpu_to_le16(suballoc_bit_start);

	new_rb->rf_fs_generation = cpu_to_le32(OCFS2_SB(sb)->fs_generation);

	new_rb->rf_blkno = cpu_to_le64(blkno);