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

Commit 9b7895ef authored by Mark Fasheh's avatar Mark Fasheh
Browse files

ocfs2: Add a name indexed b-tree to directory inodes 



This patch makes use of Ocfs2's flexible btree code to add an additional
tree to directory inodes. The new tree stores an array of small,
fixed-length records in each leaf block. Each record stores a hash value,
and pointer to a block in the traditional (unindexed) directory tree where a
dirent with the given name hash resides. Lookup exclusively uses this tree
to find dirents, thus providing us with constant time name lookups.

Some of the hashing code was copied from ext3. Unfortunately, it has lots of
unfixed checkpatch errors. I left that as-is so that tracking changes would
be easier.

Signed-off-by: default avatarMark Fasheh <mfasheh@suse.com>
Acked-by: default avatarJoel Becker <joel.becker@oracle.com>
parent 4a12ca3a

fs/ocfs2/alloc.c

+57 −0
Original line number Diff line number Diff line
@@ -294,6 +294,55 @@ static struct ocfs2_extent_tree_operations ocfs2_xattr_tree_et_ops = { 
	.eo_fill_max_leaf_clusters = ocfs2_xattr_tree_fill_max_leaf_clusters,

};



static void ocfs2_dx_root_set_last_eb_blk(struct ocfs2_extent_tree *et,

					  u64 blkno)

{

	struct ocfs2_dx_root_block *dx_root = et->et_object;



	dx_root->dr_last_eb_blk = cpu_to_le64(blkno);

}



static u64 ocfs2_dx_root_get_last_eb_blk(struct ocfs2_extent_tree *et)

{

	struct ocfs2_dx_root_block *dx_root = et->et_object;



	return le64_to_cpu(dx_root->dr_last_eb_blk);

}



static void ocfs2_dx_root_update_clusters(struct inode *inode,

					  struct ocfs2_extent_tree *et,

					  u32 clusters)

{

	struct ocfs2_dx_root_block *dx_root = et->et_object;



	le32_add_cpu(&dx_root->dr_clusters, clusters);

}



static int ocfs2_dx_root_sanity_check(struct inode *inode,

				      struct ocfs2_extent_tree *et)

{

	struct ocfs2_dx_root_block *dx_root = et->et_object;



	BUG_ON(!OCFS2_IS_VALID_DX_ROOT(dx_root));



	return 0;

}



static void ocfs2_dx_root_fill_root_el(struct ocfs2_extent_tree *et)

{

	struct ocfs2_dx_root_block *dx_root = et->et_object;



	et->et_root_el = &dx_root->dr_list;

}



static struct ocfs2_extent_tree_operations ocfs2_dx_root_et_ops = {

	.eo_set_last_eb_blk	= ocfs2_dx_root_set_last_eb_blk,

	.eo_get_last_eb_blk	= ocfs2_dx_root_get_last_eb_blk,

	.eo_update_clusters	= ocfs2_dx_root_update_clusters,

	.eo_sanity_check	= ocfs2_dx_root_sanity_check,

	.eo_fill_root_el	= ocfs2_dx_root_fill_root_el,

};



static void __ocfs2_init_extent_tree(struct ocfs2_extent_tree *et,

				     struct inode *inode,

				     struct buffer_head *bh,
@@ -339,6 +388,14 @@ void ocfs2_init_xattr_value_extent_tree(struct ocfs2_extent_tree *et, 
				 &ocfs2_xattr_value_et_ops);

}



void ocfs2_init_dx_root_extent_tree(struct ocfs2_extent_tree *et,

				    struct inode *inode,

				    struct buffer_head *bh)

{

	__ocfs2_init_extent_tree(et, inode, bh, ocfs2_journal_access_dr,

				 NULL, &ocfs2_dx_root_et_ops);

}



static inline void ocfs2_et_set_last_eb_blk(struct ocfs2_extent_tree *et,

					    u64 new_last_eb_blk)

{

fs/ocfs2/alloc.h

+3 −0
Original line number Diff line number Diff line
@@ -75,6 +75,9 @@ struct ocfs2_xattr_value_buf; 
void ocfs2_init_xattr_value_extent_tree(struct ocfs2_extent_tree *et,

					struct inode *inode,

					struct ocfs2_xattr_value_buf *vb);

void ocfs2_init_dx_root_extent_tree(struct ocfs2_extent_tree *et,

				    struct inode *inode,

				    struct buffer_head *bh);



/*

 * Read an extent block into *bh.  If *bh is NULL, a bh will be

fs/ocfs2/dir.c

+1953 −171

File changed.

Preview size limit exceeded, changes collapsed.

fs/ocfs2/dir.h

+18 −3
Original line number Diff line number Diff line
@@ -26,9 +26,21 @@ 
#ifndef OCFS2_DIR_H

#define OCFS2_DIR_H



struct ocfs2_dx_hinfo {

	u32	major_hash;

	u32	minor_hash;

};



struct ocfs2_dir_lookup_result {

	struct buffer_head		*dl_leaf_bh;

	struct ocfs2_dir_entry		*dl_entry;

	struct buffer_head		*dl_leaf_bh;	/* Unindexed leaf

							 * block */

	struct ocfs2_dir_entry		*dl_entry;	/* Target dirent in

							 * unindexed leaf */



	struct buffer_head		*dl_dx_leaf_bh;	/* Indexed leaf block */

	struct ocfs2_dx_entry		*dl_dx_entry;	/* Target dx_entry in

							 * indexed leaf */

	struct ocfs2_dx_hinfo		dl_hinfo;	/* Name hash results */

};

void ocfs2_free_dir_lookup_result(struct ocfs2_dir_lookup_result *res);
@@ -85,7 +97,10 @@ int ocfs2_fill_new_dir(struct ocfs2_super *osb, 
		       struct inode *parent,

		       struct inode *inode,

		       struct buffer_head *fe_bh,

		       struct ocfs2_alloc_context *data_ac);

		       struct ocfs2_alloc_context *data_ac,

		       struct ocfs2_alloc_context *meta_ac);



int ocfs2_dx_dir_truncate(struct inode *dir, struct buffer_head *di_bh);



struct ocfs2_dir_block_trailer *ocfs2_dir_trailer_from_size(int blocksize,

							    void *data);

fs/ocfs2/inode.c

+11 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include "ocfs2.h"



#include "alloc.h"

#include "dir.h"

#include "blockcheck.h"

#include "dlmglue.h"

#include "extent_map.h"
@@ -740,6 +741,15 @@ static int ocfs2_wipe_inode(struct inode *inode, 
		goto bail_unlock_dir;

	}



	/* Remove any dir index tree */

	if (S_ISDIR(inode->i_mode)) {

		status = ocfs2_dx_dir_truncate(inode, di_bh);

		if (status) {

			mlog_errno(status);

			goto bail_unlock_dir;

		}

	}



	/*Free extended attribute resources associated with this inode.*/

	status = ocfs2_xattr_remove(inode, di_bh);

	if (status < 0) {