|
@@ -3009,7 +3009,6 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,
|
|
int pending_del_nr = 0;
|
|
int pending_del_nr = 0;
|
|
int pending_del_slot = 0;
|
|
int pending_del_slot = 0;
|
|
int extent_type = -1;
|
|
int extent_type = -1;
|
|
- int encoding;
|
|
|
|
int ret;
|
|
int ret;
|
|
int err = 0;
|
|
int err = 0;
|
|
u64 ino = btrfs_ino(inode);
|
|
u64 ino = btrfs_ino(inode);
|
|
@@ -3059,7 +3058,6 @@ search_again:
|
|
leaf = path->nodes[0];
|
|
leaf = path->nodes[0];
|
|
btrfs_item_key_to_cpu(leaf, &found_key, path->slots[0]);
|
|
btrfs_item_key_to_cpu(leaf, &found_key, path->slots[0]);
|
|
found_type = btrfs_key_type(&found_key);
|
|
found_type = btrfs_key_type(&found_key);
|
|
- encoding = 0;
|
|
|
|
|
|
|
|
if (found_key.objectid != ino)
|
|
if (found_key.objectid != ino)
|
|
break;
|
|
break;
|
|
@@ -3072,10 +3070,6 @@ search_again:
|
|
fi = btrfs_item_ptr(leaf, path->slots[0],
|
|
fi = btrfs_item_ptr(leaf, path->slots[0],
|
|
struct btrfs_file_extent_item);
|
|
struct btrfs_file_extent_item);
|
|
extent_type = btrfs_file_extent_type(leaf, fi);
|
|
extent_type = btrfs_file_extent_type(leaf, fi);
|
|
- encoding = btrfs_file_extent_compression(leaf, fi);
|
|
|
|
- encoding |= btrfs_file_extent_encryption(leaf, fi);
|
|
|
|
- encoding |= btrfs_file_extent_other_encoding(leaf, fi);
|
|
|
|
-
|
|
|
|
if (extent_type != BTRFS_FILE_EXTENT_INLINE) {
|
|
if (extent_type != BTRFS_FILE_EXTENT_INLINE) {
|
|
item_end +=
|
|
item_end +=
|
|
btrfs_file_extent_num_bytes(leaf, fi);
|
|
btrfs_file_extent_num_bytes(leaf, fi);
|
|
@@ -3103,7 +3097,7 @@ search_again:
|
|
if (extent_type != BTRFS_FILE_EXTENT_INLINE) {
|
|
if (extent_type != BTRFS_FILE_EXTENT_INLINE) {
|
|
u64 num_dec;
|
|
u64 num_dec;
|
|
extent_start = btrfs_file_extent_disk_bytenr(leaf, fi);
|
|
extent_start = btrfs_file_extent_disk_bytenr(leaf, fi);
|
|
- if (!del_item && !encoding) {
|
|
|
|
|
|
+ if (!del_item) {
|
|
u64 orig_num_bytes =
|
|
u64 orig_num_bytes =
|
|
btrfs_file_extent_num_bytes(leaf, fi);
|
|
btrfs_file_extent_num_bytes(leaf, fi);
|
|
extent_num_bytes = new_size -
|
|
extent_num_bytes = new_size -
|