aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/alloc.c
diff options
context:
space:
mode:
authorJoel Becker <joel.becker@oracle.com>2009-02-13 06:34:15 -0500
committerJoel Becker <joel.becker@oracle.com>2009-09-04 19:08:09 -0400
commitcbee7e1a6a1a2a3d6eda1f76ffc38a3ed3eeb6cc (patch)
tree438ac4917675c27ecd3dce694ae3affd7ebf6c91 /fs/ocfs2/alloc.c
parentcc79d8c19e9d39446525a1026f1a21761f5d3cd2 (diff)
ocfs2: ocfs2_add_clusters_in_btree() no longer needs struct inode.
One more function that doesn't need a struct inode to pass to its children. Signed-off-by: Joel Becker <joel.becker@oracle.com>
Diffstat (limited to 'fs/ocfs2/alloc.c')
-rw-r--r--fs/ocfs2/alloc.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index c4943b91c7a4..29095e155949 100644
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
@@ -4758,13 +4758,11 @@ bail:
4758 * it is not limited to the file storage. Any extent tree can use this 4758 * it is not limited to the file storage. Any extent tree can use this
4759 * function if it implements the proper ocfs2_extent_tree. 4759 * function if it implements the proper ocfs2_extent_tree.
4760 */ 4760 */
4761int ocfs2_add_clusters_in_btree(struct ocfs2_super *osb, 4761int ocfs2_add_clusters_in_btree(handle_t *handle,
4762 struct inode *inode, 4762 struct ocfs2_extent_tree *et,
4763 u32 *logical_offset, 4763 u32 *logical_offset,
4764 u32 clusters_to_add, 4764 u32 clusters_to_add,
4765 int mark_unwritten, 4765 int mark_unwritten,
4766 struct ocfs2_extent_tree *et,
4767 handle_t *handle,
4768 struct ocfs2_alloc_context *data_ac, 4766 struct ocfs2_alloc_context *data_ac,
4769 struct ocfs2_alloc_context *meta_ac, 4767 struct ocfs2_alloc_context *meta_ac,
4770 enum ocfs2_alloc_restarted *reason_ret) 4768 enum ocfs2_alloc_restarted *reason_ret)
@@ -4775,6 +4773,8 @@ int ocfs2_add_clusters_in_btree(struct ocfs2_super *osb,
4775 u32 bit_off, num_bits; 4773 u32 bit_off, num_bits;
4776 u64 block; 4774 u64 block;
4777 u8 flags = 0; 4775 u8 flags = 0;
4776 struct ocfs2_super *osb =
4777 OCFS2_SB(ocfs2_metadata_cache_get_super(et->et_ci));
4778 4778
4779 BUG_ON(!clusters_to_add); 4779 BUG_ON(!clusters_to_add);
4780 4780
@@ -4826,8 +4826,9 @@ int ocfs2_add_clusters_in_btree(struct ocfs2_super *osb,
4826 } 4826 }
4827 4827
4828 block = ocfs2_clusters_to_blocks(osb->sb, bit_off); 4828 block = ocfs2_clusters_to_blocks(osb->sb, bit_off);
4829 mlog(0, "Allocating %u clusters at block %u for inode %llu\n", 4829 mlog(0, "Allocating %u clusters at block %u for owner %llu\n",
4830 num_bits, bit_off, (unsigned long long)OCFS2_I(inode)->ip_blkno); 4830 num_bits, bit_off,
4831 (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci));
4831 status = ocfs2_insert_extent(handle, et, *logical_offset, block, 4832 status = ocfs2_insert_extent(handle, et, *logical_offset, block,
4832 num_bits, flags, meta_ac); 4833 num_bits, flags, meta_ac);
4833 if (status < 0) { 4834 if (status < 0) {