diff options
| -rw-r--r-- | fs/btrfs/file.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index d83260d7498f..53bf2d764bbc 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c | |||
| @@ -567,6 +567,7 @@ int btrfs_drop_extents(struct btrfs_trans_handle *trans, struct inode *inode, | |||
| 567 | int extent_type; | 567 | int extent_type; |
| 568 | int recow; | 568 | int recow; |
| 569 | int ret; | 569 | int ret; |
| 570 | int modify_tree = -1; | ||
| 570 | 571 | ||
| 571 | if (drop_cache) | 572 | if (drop_cache) |
| 572 | btrfs_drop_extent_cache(inode, start, end - 1, 0); | 573 | btrfs_drop_extent_cache(inode, start, end - 1, 0); |
| @@ -575,10 +576,13 @@ int btrfs_drop_extents(struct btrfs_trans_handle *trans, struct inode *inode, | |||
| 575 | if (!path) | 576 | if (!path) |
| 576 | return -ENOMEM; | 577 | return -ENOMEM; |
| 577 | 578 | ||
| 579 | if (start >= BTRFS_I(inode)->disk_i_size) | ||
| 580 | modify_tree = 0; | ||
| 581 | |||
| 578 | while (1) { | 582 | while (1) { |
| 579 | recow = 0; | 583 | recow = 0; |
| 580 | ret = btrfs_lookup_file_extent(trans, root, path, ino, | 584 | ret = btrfs_lookup_file_extent(trans, root, path, ino, |
| 581 | search_start, -1); | 585 | search_start, modify_tree); |
| 582 | if (ret < 0) | 586 | if (ret < 0) |
| 583 | break; | 587 | break; |
| 584 | if (ret > 0 && path->slots[0] > 0 && search_start == start) { | 588 | if (ret > 0 && path->slots[0] > 0 && search_start == start) { |
| @@ -634,7 +638,8 @@ next_slot: | |||
| 634 | } | 638 | } |
| 635 | 639 | ||
| 636 | search_start = max(key.offset, start); | 640 | search_start = max(key.offset, start); |
| 637 | if (recow) { | 641 | if (recow || !modify_tree) { |
| 642 | modify_tree = -1; | ||
| 638 | btrfs_release_path(path); | 643 | btrfs_release_path(path); |
| 639 | continue; | 644 | continue; |
| 640 | } | 645 | } |
