kernel.git/fs/ocfs2/alloc.c, branch linux-2.6.28.y

ocfs2: Simplify ocfs2_read_block()

2008-10-14T18:51:57Z

More than 30 callers of ocfs2_read_block() pass exactly OCFS2_BH_CACHED. Only six pass a different flag set. Rather than have every caller care, let's make ocfs2_read_block() take no flags and always do a cached read. The remaining six places can call ocfs2_read_blocks() directly. Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh

ocfs2: Require an inode for ocfs2_read_block(s)().

2008-10-14T18:43:29Z

Now that synchronous readers are using ocfs2_read_blocks_sync(), all callers of ocfs2_read_blocks() are passing an inode. Use it unconditionally. Since it's there, we don't need to pass the ocfs2_super either. Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh

ocfs2: Don't check for NULL before brelse()

2008-10-14T00:02:44Z

This is pointless as brelse() already does the check. Signed-off-by: Mark Fasheh

ocfs2: Switch over to JBD2.

2008-10-14T00:02:43Z

ocfs2 wants JBD2 for many reasons, not the least of which is that JBD is limiting our maximum filesystem size. It's a pretty trivial change. Most functions are just renamed. The only functional change is moving to Jan's inode-based ordered data mode. It's better, too. Because JBD2 reads and writes JBD journals, this is compatible with any existing filesystem. It can even interact with JBD-based ocfs2 as long as the journal is formated for JBD. We provide a compatibility option so that paranoid people can still use JBD for the time being. This will go away shortly. [ Moved call of ocfs2_begin_ordered_truncate() from ocfs2_delete_inode() to ocfs2_truncate_for_delete(). --Mark ] Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh

ocfs2: Change ocfs2_get__extent_tree() to ocfs2_init__extent_tree()

2008-10-13T23:57:05Z

The original get/put_extent_tree() functions held a reference on et_root_bh. However, every single caller already has a safe reference, making the get/put cycle irrelevant. We change ocfs2_get_*_extent_tree() to ocfs2_init_*_extent_tree(). It no longer gets a reference on et_root_bh. ocfs2_put_extent_tree() is removed. Callers now have a simpler init+use pattern. Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh

ocfs2: Comment struct ocfs2_extent_tree_operations.

2008-10-13T23:57:05Z

struct ocfs2_extent_tree_operations provides methods for the different on-disk btrees in ocfs2. Describing what those methods do is probably a good idea. Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh

ocfs2: Make ocfs2_extent_tree the first-class representation of a tree.

2008-10-13T23:57:05Z

We now have three different kinds of extent trees in ocfs2: inode data (dinode), extended attributes (xattr_tree), and extended attribute values (xattr_value). There is a nice abstraction for them, ocfs2_extent_tree, but it is hidden in alloc.c. All the calling functions have to pick amongst a varied API and pass in type bits and often extraneous pointers. A better way is to make ocfs2_extent_tree a first-class object. Everyone converts their object to an ocfs2_extent_tree() via the ocfs2_get_*_extent_tree() calls, then uses the ocfs2_extent_tree for all tree calls to alloc.c. This simplifies a lot of callers, making for readability. It also provides an easy way to add additional extent tree types, as they only need to be defined in alloc.c with a ocfs2_get__extent_tree() function. Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh

ocfs2: Add an insertion check to ocfs2_extent_tree_operations.

2008-10-13T23:57:05Z

A couple places check an extent_tree for a valid inode. We move that out to add an eo_insert_check() operation. It can be called from ocfs2_insert_extent() and elsewhere. We also have the wrapper calls ocfs2_et_insert_check() and ocfs2_et_sanity_check() ignore NULL ops. That way we don't have to provide useless operations for xattr types. Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh

ocfs2: Create specific get_extent_tree functions.

2008-10-13T23:57:05Z

A caller knows what kind of extent tree they have. There's no reason they have to call ocfs2_get_extent_tree() with a NULL when they could just as easily call a specific function to their type of extent tree. Introduce ocfs2_dinode_get_extent_tree(), ocfs2_xattr_tree_get_extent_tree(), and ocfs2_xattr_value_get_extent_tree(). They only take the necessary arguments, calling into the underlying __ocfs2_get_extent_tree() to do the real work. __ocfs2_get_extent_tree() is the old ocfs2_get_extent_tree(), but without needing any switch-by-type logic. ocfs2_get_extent_tree() is now a wrapper around the specific calls. It exists because a couple alloc.c functions can take et_type. This will go later. Another benefit is that ocfs2_xattr_value_get_extent_tree() can take a struct ocfs2_xattr_value_root* instead of void*. This gives us typechecking where we didn't have it before. Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh

ocfs2: Determine an extent tree's max_leaf_clusters in an et_op.

2008-10-13T23:57:04Z

Provide an optional extent_tree_operation to specify the max_leaf_clusters of an ocfs2_extent_tree. If not provided, the value is 0 (unlimited). Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh

kernel.git/fs/ocfs2/alloc.c, branch linux-2.6.28.y

ocfs2: Simplify ocfs2_read_block()

ocfs2: Require an inode for ocfs2_read_block(s)().

ocfs2: Don't check for NULL before brelse()

ocfs2: Switch over to JBD2.

ocfs2: Change ocfs2_get_*_extent_tree() to ocfs2_init_*_extent_tree()

ocfs2: Comment struct ocfs2_extent_tree_operations.

ocfs2: Make ocfs2_extent_tree the first-class representation of a tree.

ocfs2: Add an insertion check to ocfs2_extent_tree_operations.

ocfs2: Create specific get_extent_tree functions.

ocfs2: Determine an extent tree's max_leaf_clusters in an et_op.

ocfs2: Change ocfs2_get__extent_tree() to ocfs2_init__extent_tree()