diff options
| author | Tao Ma <tao.ma@oracle.com> | 2010-03-22 14:20:18 +0800 |
|---|---|---|
| committer | Tao Ma <tao.ma@oracle.com> | 2010-03-22 14:20:18 +0800 |
| commit | 74380c479ad83addeff8a172ab95f59557b5b0c3 (patch) | |
| tree | 49b94f3ff48cd2ca6b53977a5e3070380ccecd6b /fs/ocfs2/refcounttree.c | |
| parent | af2bf0d86019e0b0306965321096f8380b7ca830 (diff) | |
| download | blackbird-op-linux-74380c479ad83addeff8a172ab95f59557b5b0c3.tar.gz blackbird-op-linux-74380c479ad83addeff8a172ab95f59557b5b0c3.zip | |
ocfs2: Free block to the right block group.
In case the block we are going to free is allocated from
a discontiguous block group, we have to use suballoc_loc
to be the right group.
Signed-off-by: Tao Ma <tao.ma@oracle.com>
Diffstat (limited to 'fs/ocfs2/refcounttree.c')
| -rw-r--r-- | fs/ocfs2/refcounttree.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c index 275920e8a40d..b34702984225 100644 --- a/fs/ocfs2/refcounttree.c +++ b/fs/ocfs2/refcounttree.c @@ -792,7 +792,10 @@ int ocfs2_remove_refcount_tree(struct inode *inode, struct buffer_head *di_bh) if (le32_to_cpu(rb->rf_count) == 1) { blk = le64_to_cpu(rb->rf_blkno); bit = le16_to_cpu(rb->rf_suballoc_bit); - bg_blkno = ocfs2_which_suballoc_group(blk, bit); + if (rb->rf_suballoc_loc) + bg_blkno = le64_to_cpu(rb->rf_suballoc_loc); + else + bg_blkno = ocfs2_which_suballoc_group(blk, bit); alloc_inode = ocfs2_get_system_file_inode(osb, EXTENT_ALLOC_SYSTEM_INODE, @@ -2108,6 +2111,7 @@ static int ocfs2_remove_refcount_extent(handle_t *handle, */ ret = ocfs2_cache_block_dealloc(dealloc, EXTENT_ALLOC_SYSTEM_INODE, le16_to_cpu(rb->rf_suballoc_slot), + le64_to_cpu(rb->rf_suballoc_loc), le64_to_cpu(rb->rf_blkno), le16_to_cpu(rb->rf_suballoc_bit)); if (ret) { |
