---

yaml --- r: 128532 b: refs/heads/master c: 008630c h: refs/heads/master v: v3
git-mirror · Sep 25, 2008 · e263b88 · e263b88
1 parent 85d2996
commit e263b88
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34a3821873aeabff2607c8093bce82cd1fbcfd60
+refs/heads/master: 008630c17cc5654e141c7fd24a3e737de643fec1
diff --git a/trunk/fs/btrfs/inode.c b/trunk/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) {