Skip to content

Commit

Permalink
Btrfs: Change btrfs_truncate_inode_items to stop when it hits the inode
Browse files Browse the repository at this point in the history
btrfs_truncate_inode_items is setup to stop doing btree searches when
it has finished removing the items for the inode.  It used to detect the
end of the inode by looking for an objectid that didn't match the
one we were searching for.

But, this would result in an extra search through the btree, which
adds extra balancing and cow costs to the operation.

This commit adds a check to see if we found the inode item, which means
we can stop searching early.

Signed-off-by: Chris Mason <chris.mason@oracle.com>
  • Loading branch information
Chris Mason committed Feb 4, 2009
1 parent f03d930 commit 06d9a8d
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion fs/btrfs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -2504,7 +2504,7 @@ noinline int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,
struct btrfs_path *path;
struct btrfs_key key;
struct btrfs_key found_key;
u32 found_type;
u32 found_type = (u8)-1;
struct extent_buffer *leaf;
struct btrfs_file_extent_item *fi;
u64 extent_start = 0;
Expand Down Expand Up @@ -2691,6 +2691,8 @@ noinline int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,
if (pending_del_nr)
goto del_pending;
btrfs_release_path(root, path);
if (found_type == BTRFS_INODE_ITEM_KEY)
break;
goto search_again;
}

Expand All @@ -2707,6 +2709,8 @@ noinline int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,
BUG_ON(ret);
pending_del_nr = 0;
btrfs_release_path(root, path);
if (found_type == BTRFS_INODE_ITEM_KEY)
break;
goto search_again;
}
}
Expand Down

0 comments on commit 06d9a8d

Please sign in to comment.