diff options
| author | Joel Becker <joel.becker@oracle.com> | 2009-02-13 03:34:15 -0800 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2009-09-04 16:08:09 -0700 |
| commit | cbee7e1a6a1a2a3d6eda1f76ffc38a3ed3eeb6cc (patch) | |
| tree | 438ac4917675c27ecd3dce694ae3affd7ebf6c91 /fs/ocfs2/alloc.c | |
| parent | cc79d8c19e9d39446525a1026f1a21761f5d3cd2 (diff) | |
| download | kernel-common-cbee7e1a6a1a2a3d6eda1f76ffc38a3ed3eeb6cc.tar.gz kernel-common-cbee7e1a6a1a2a3d6eda1f76ffc38a3ed3eeb6cc.tar.bz2 kernel-common-cbee7e1a6a1a2a3d6eda1f76ffc38a3ed3eeb6cc.zip | |
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.c | 13 |
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: * it is not limited to the file storage. Any extent tree can use this * function if it implements the proper ocfs2_extent_tree. */ -int ocfs2_add_clusters_in_btree(struct ocfs2_super *osb, - struct inode *inode, +int ocfs2_add_clusters_in_btree(handle_t *handle, + struct ocfs2_extent_tree *et, u32 *logical_offset, u32 clusters_to_add, int mark_unwritten, - struct ocfs2_extent_tree *et, - handle_t *handle, struct ocfs2_alloc_context *data_ac, struct ocfs2_alloc_context *meta_ac, enum ocfs2_alloc_restarted *reason_ret) @@ -4775,6 +4773,8 @@ int ocfs2_add_clusters_in_btree(struct ocfs2_super *osb, u32 bit_off, num_bits; u64 block; u8 flags = 0; + struct ocfs2_super *osb = + OCFS2_SB(ocfs2_metadata_cache_get_super(et->et_ci)); BUG_ON(!clusters_to_add); @@ -4826,8 +4826,9 @@ int ocfs2_add_clusters_in_btree(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); + mlog(0, "Allocating %u clusters at block %u for owner %llu\n", + num_bits, bit_off, + (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci)); status = ocfs2_insert_extent(handle, et, *logical_offset, block, num_bits, flags, meta_ac); if (status < 0) { |