diff options
author | Josef Bacik <josef@redhat.com> | 2011-04-05 19:25:36 -0400 |
---|---|---|
committer | Josef Bacik <josef@redhat.com> | 2011-04-08 13:00:36 -0400 |
commit | 1ef30be142d2cc60e2687ef267de864cf31be995 (patch) | |
tree | dbbde7067995b62e4123b44b3c62d7b5efc9ee24 /fs | |
parent | 12ddb96cb6752218d8a1aeb696ec9b0ca7adb42f (diff) |
Btrfs: do not call btrfs_update_inode in endio if nothing changed
In the DIO code we often don't update the i_disk_size because the i_size isn't
updated until after the DIO is completed, so basically we are allocating a path,
doing a search, and updating the inode item for no reason since nothing changed.
btrfs_ordered_update_i_size will return 1 if it didn't update i_disk_size, so
only run btrfs_update_inode if btrfs_ordered_update_i_size returns 0. Thanks,
Signed-off-by: Josef Bacik <josef@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/btrfs/inode.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index da2680263d9f..4a238d676e5b 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
@@ -1769,9 +1769,12 @@ static int btrfs_finish_ordered_io(struct inode *inode, u64 start, u64 end) | |||
1769 | add_pending_csums(trans, inode, ordered_extent->file_offset, | 1769 | add_pending_csums(trans, inode, ordered_extent->file_offset, |
1770 | &ordered_extent->list); | 1770 | &ordered_extent->list); |
1771 | 1771 | ||
1772 | btrfs_ordered_update_i_size(inode, 0, ordered_extent); | 1772 | ret = btrfs_ordered_update_i_size(inode, 0, ordered_extent); |
1773 | ret = btrfs_update_inode(trans, root, inode); | 1773 | if (!ret) { |
1774 | BUG_ON(ret); | 1774 | ret = btrfs_update_inode(trans, root, inode); |
1775 | BUG_ON(ret); | ||
1776 | } | ||
1777 | ret = 0; | ||
1775 | out: | 1778 | out: |
1776 | if (nolock) { | 1779 | if (nolock) { |
1777 | if (trans) | 1780 | if (trans) |
@@ -5865,8 +5868,10 @@ again: | |||
5865 | } | 5868 | } |
5866 | 5869 | ||
5867 | add_pending_csums(trans, inode, ordered->file_offset, &ordered->list); | 5870 | add_pending_csums(trans, inode, ordered->file_offset, &ordered->list); |
5868 | btrfs_ordered_update_i_size(inode, 0, ordered); | 5871 | ret = btrfs_ordered_update_i_size(inode, 0, ordered); |
5869 | btrfs_update_inode(trans, root, inode); | 5872 | if (!ret) |
5873 | btrfs_update_inode(trans, root, inode); | ||
5874 | ret = 0; | ||
5870 | out_unlock: | 5875 | out_unlock: |
5871 | unlock_extent_cached(&BTRFS_I(inode)->io_tree, ordered->file_offset, | 5876 | unlock_extent_cached(&BTRFS_I(inode)->io_tree, ordered->file_offset, |
5872 | ordered->file_offset + ordered->len - 1, | 5877 | ordered->file_offset + ordered->len - 1, |