diff options
author | Yan <yanzheng@21cn.com> | 2007-11-07 13:31:09 -0500 |
---|---|---|
committer | Chris Mason <chris.mason@oracle.com> | 2008-09-25 11:03:57 -0400 |
commit | 008630c17cc5654e141c7fd24a3e737de643fec1 (patch) | |
tree | 5f46b4c573d4410cdf514158152fbf511861afe9 /fs/btrfs/inode.c | |
parent | 34a3821873aeabff2607c8093bce82cd1fbcfd60 (diff) |
Properly delete csum item in btrfs_truncate_in_trans.
When 'item_end' is equal to 'inode->i_size', 'found_type' is updated
and current item is skipped. This behavior is correct for extent item,
but incorrect for csum item. For example, there is a csum item with
'offset == 0'. When deleting the inode, 'inode->i_size' is set to 0,
so the csum item isn't deleted.
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/inode.c')
-rw-r--r-- | fs/btrfs/inode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 25f32d7c7ee8..90cb71d68294 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
@@ -611,13 +611,14 @@ static int btrfs_truncate_in_trans(struct btrfs_trans_handle *trans, | |||
611 | item_end += btrfs_file_extent_inline_len(leaf, | 611 | item_end += btrfs_file_extent_inline_len(leaf, |
612 | item); | 612 | item); |
613 | } | 613 | } |
614 | item_end--; | ||
614 | } | 615 | } |
615 | if (found_type == BTRFS_CSUM_ITEM_KEY) { | 616 | if (found_type == BTRFS_CSUM_ITEM_KEY) { |
616 | ret = btrfs_csum_truncate(trans, root, path, | 617 | ret = btrfs_csum_truncate(trans, root, path, |
617 | inode->i_size); | 618 | inode->i_size); |
618 | BUG_ON(ret); | 619 | BUG_ON(ret); |
619 | } | 620 | } |
620 | if (item_end <= inode->i_size) { | 621 | if (item_end < inode->i_size) { |
621 | if (found_type == BTRFS_DIR_ITEM_KEY) { | 622 | if (found_type == BTRFS_DIR_ITEM_KEY) { |
622 | found_type = BTRFS_INODE_ITEM_KEY; | 623 | found_type = BTRFS_INODE_ITEM_KEY; |
623 | } else if (found_type == BTRFS_EXTENT_ITEM_KEY) { | 624 | } else if (found_type == BTRFS_EXTENT_ITEM_KEY) { |