From: Yan <yanzheng@21cn.com>
Date: Wed, 7 Nov 2007 18:31:09 +0000 (-0500)
Subject: Properly delete csum item in btrfs_truncate_in_trans.
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=008630c17cc5654e141c7fd24a3e737de643fec1;p=openwrt%2Fstaging%2Fblogic.git

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>
---

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,
 				item_end += btrfs_file_extent_inline_len(leaf,
 									 item);
 			}
+			item_end--;
 		}
 		if (found_type == BTRFS_CSUM_ITEM_KEY) {
 			ret = btrfs_csum_truncate(trans, root, path,
 						  inode->i_size);
 			BUG_ON(ret);
 		}
-		if (item_end <= inode->i_size) {
+		if (item_end < inode->i_size) {
 			if (found_type == BTRFS_DIR_ITEM_KEY) {
 				found_type = BTRFS_INODE_ITEM_KEY;
 			} else if (found_type == BTRFS_EXTENT_ITEM_KEY) {