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

Commit dcd0538f authored by Mark Fasheh's avatar Mark Fasheh
Browse files

ocfs2: sparse b-tree support 



Introduce tree rotations into the b-tree code. This will allow ocfs2 to
support sparse files. Much of the added code is designed to be generic (in
the ocfs2 sense) so that it can later be re-used to implement large
extended attributes.

This patch only adds the rotation code and does minimal updates to callers
of the extent api.

Signed-off-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
parent 6f16bf65

fs/ocfs2/alloc.c

+1987 −507

File changed.

Preview size limit exceeded, changes collapsed.

fs/ocfs2/alloc.h

+2 −1
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ int ocfs2_insert_extent(struct ocfs2_super *osb, 
			handle_t *handle,

			struct inode *inode,

			struct buffer_head *fe_bh,

			u64 blkno,

			u32 cpos,

			u64 start_blk,

			u32 new_clusters,

			struct ocfs2_alloc_context *meta_ac);

int ocfs2_num_free_extents(struct ocfs2_super *osb,

fs/ocfs2/dir.c

+4 −2
Original line number Diff line number Diff line
@@ -365,8 +365,10 @@ int ocfs2_do_extend_dir(struct super_block *sb, 
	spin_unlock(&OCFS2_I(dir)->ip_lock);



	if (extend) {

		status = ocfs2_do_extend_allocation(OCFS2_SB(sb), dir, 1,

						    parent_fe_bh, handle,

		u32 offset = OCFS2_I(dir)->ip_clusters;



		status = ocfs2_do_extend_allocation(OCFS2_SB(sb), dir, &offset,

						    1, parent_fe_bh, handle,

						    data_ac, meta_ac, NULL);

		BUG_ON(status == -EAGAIN);

		if (status < 0) {

fs/ocfs2/file.c

+15 −8
Original line number Diff line number Diff line
@@ -397,6 +397,7 @@ bail: 
 */

int ocfs2_do_extend_allocation(struct ocfs2_super *osb,

			       struct inode *inode,

			       u32 *logical_offset,

			       u32 clusters_to_add,

			       struct buffer_head *fe_bh,

			       handle_t *handle,
@@ -460,18 +461,14 @@ int ocfs2_do_extend_allocation(struct ocfs2_super *osb, 
	block = ocfs2_clusters_to_blocks(osb->sb, bit_off);

	mlog(0, "Allocating %u clusters at block %u for inode %llu\n",

	     num_bits, bit_off, (unsigned long long)OCFS2_I(inode)->ip_blkno);

	status = ocfs2_insert_extent(osb, handle, inode, fe_bh, block,

				     num_bits, meta_ac);

	status = ocfs2_insert_extent(osb, handle, inode, fe_bh,

				     *logical_offset, block, num_bits,

				     meta_ac);

	if (status < 0) {

		mlog_errno(status);

		goto leave;

	}



	le32_add_cpu(&fe->i_clusters, num_bits);

	spin_lock(&OCFS2_I(inode)->ip_lock);

	OCFS2_I(inode)->ip_clusters = le32_to_cpu(fe->i_clusters);

	spin_unlock(&OCFS2_I(inode)->ip_lock);



	status = ocfs2_journal_dirty(handle, fe_bh);

	if (status < 0) {

		mlog_errno(status);
@@ -479,6 +476,7 @@ int ocfs2_do_extend_allocation(struct ocfs2_super *osb, 
	}



	clusters_to_add -= num_bits;

	*logical_offset += num_bits;



	if (clusters_to_add) {

		mlog(0, "need to alloc once more, clusters = %u, wanted = "
@@ -501,7 +499,7 @@ static int ocfs2_extend_allocation(struct inode *inode, 
	int restart_func = 0;

	int drop_alloc_sem = 0;

	int credits, num_free_extents;

	u32 prev_clusters;

	u32 prev_clusters, logical_start;

	struct buffer_head *bh = NULL;

	struct ocfs2_dinode *fe = NULL;

	handle_t *handle = NULL;
@@ -512,6 +510,12 @@ static int ocfs2_extend_allocation(struct inode *inode, 


	mlog_entry("(clusters_to_add = %u)\n", clusters_to_add);



	/*

	 * This function only exists for file systems which don't

	 * support holes.

	 */

	BUG_ON(ocfs2_sparse_alloc(osb));



	status = ocfs2_read_block(osb, OCFS2_I(inode)->ip_blkno, &bh,

				  OCFS2_BH_CACHED, inode);

	if (status < 0) {
@@ -526,6 +530,8 @@ static int ocfs2_extend_allocation(struct inode *inode, 
		goto leave;

	}



	logical_start = OCFS2_I(inode)->ip_clusters;



restart_all:

	BUG_ON(le32_to_cpu(fe->i_clusters) != OCFS2_I(inode)->ip_clusters);
@@ -590,6 +596,7 @@ restarted_transaction: 


	status = ocfs2_do_extend_allocation(osb,

					    inode,

					    &logical_start,

					    clusters_to_add,

					    bh,

					    handle,

fs/ocfs2/file.h

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ enum ocfs2_alloc_restarted { 
};

int ocfs2_do_extend_allocation(struct ocfs2_super *osb,

			       struct inode *inode,

			       u32 *cluster_start,

			       u32 clusters_to_add,

			       struct buffer_head *fe_bh,

			       handle_t *handle,