diff options
| author | Mark Fasheh <mfasheh@suse.com> | 2010-08-13 15:15:16 -0700 |
|---|---|---|
| committer | Tao Ma <tao.ma@oracle.com> | 2010-09-08 14:25:58 +0800 |
| commit | d51349829c378c06ba4aa7d4b16ca23739858608 (patch) | |
| tree | 972c0087222f803e7789a44e40e27585790333bf /fs | |
| parent | 021960cab320ae3cc4e9aba9cca42f9f5ce785f3 (diff) | |
| download | linux-3.10-d51349829c378c06ba4aa7d4b16ca23739858608.tar.gz linux-3.10-d51349829c378c06ba4aa7d4b16ca23739858608.tar.bz2 linux-3.10-d51349829c378c06ba4aa7d4b16ca23739858608.zip | |
ocfs2: use ocfs2_alloc_dinode_update_counts() instead of open coding
ocfs2_search_chain() makes the same updates as
ocfs2_alloc_dinode_update_counts to the alloc inode. Instead of open coding
the bitmap update, use our helper function.
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Signed-off-by: Tao Ma <tao.ma@oracle.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ocfs2/suballoc.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c index b93d7e72175..e7edda8c6a1 100644 --- a/fs/ocfs2/suballoc.c +++ b/fs/ocfs2/suballoc.c @@ -1719,7 +1719,6 @@ static int ocfs2_search_chain(struct ocfs2_alloc_context *ac, { int status; u16 chain; - u32 tmp_used; u64 next_group; struct inode *alloc_inode = ac->ac_inode; struct buffer_head *group_bh = NULL; @@ -1807,22 +1806,14 @@ static int ocfs2_search_chain(struct ocfs2_alloc_context *ac, } } - /* Ok, claim our bits now: set the info on dinode, chainlist - * and then the group */ - status = ocfs2_journal_access_di(handle, - INODE_CACHE(alloc_inode), - ac->ac_bh, - OCFS2_JOURNAL_ACCESS_WRITE); - if (status < 0) { + status = ocfs2_alloc_dinode_update_counts(alloc_inode, handle, + ac->ac_bh, res->sr_bits, + chain); + if (status) { mlog_errno(status); goto bail; } - tmp_used = le32_to_cpu(fe->id1.bitmap1.i_used); - fe->id1.bitmap1.i_used = cpu_to_le32(res->sr_bits + tmp_used); - le32_add_cpu(&cl->cl_recs[chain].c_free, -res->sr_bits); - ocfs2_journal_dirty(handle, ac->ac_bh); - status = ocfs2_block_group_set_bits(handle, alloc_inode, bg, |