diff options
Diffstat (limited to 'fs/btrfs/inode.c')
-rw-r--r-- | fs/btrfs/inode.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index a3942a70f97d..a34e5a9c51cb 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
@@ -1769,8 +1769,8 @@ static void btrfs_clear_bit_hook(struct inode *inode, | |||
1769 | 1769 | ||
1770 | if (root->root_key.objectid != BTRFS_DATA_RELOC_TREE_OBJECTID | 1770 | if (root->root_key.objectid != BTRFS_DATA_RELOC_TREE_OBJECTID |
1771 | && do_list && !(state->state & EXTENT_NORESERVE)) | 1771 | && do_list && !(state->state & EXTENT_NORESERVE)) |
1772 | __btrfs_free_reserved_data_space(inode, state->start, | 1772 | btrfs_free_reserved_data_space(inode, state->start, |
1773 | len); | 1773 | len); |
1774 | 1774 | ||
1775 | __percpu_counter_add(&root->fs_info->delalloc_bytes, -len, | 1775 | __percpu_counter_add(&root->fs_info->delalloc_bytes, -len, |
1776 | root->fs_info->delalloc_batch); | 1776 | root->fs_info->delalloc_batch); |
@@ -1993,8 +1993,8 @@ again: | |||
1993 | goto again; | 1993 | goto again; |
1994 | } | 1994 | } |
1995 | 1995 | ||
1996 | ret = __btrfs_delalloc_reserve_space(inode, page_start, | 1996 | ret = btrfs_delalloc_reserve_space(inode, page_start, |
1997 | PAGE_CACHE_SIZE); | 1997 | PAGE_CACHE_SIZE); |
1998 | if (ret) { | 1998 | if (ret) { |
1999 | mapping_set_error(page->mapping, ret); | 1999 | mapping_set_error(page->mapping, ret); |
2000 | end_extent_writepage(page, ret, page_start, page_end); | 2000 | end_extent_writepage(page, ret, page_start, page_end); |
@@ -4640,7 +4640,7 @@ int btrfs_truncate_page(struct inode *inode, loff_t from, loff_t len, | |||
4640 | if ((offset & (blocksize - 1)) == 0 && | 4640 | if ((offset & (blocksize - 1)) == 0 && |
4641 | (!len || ((len & (blocksize - 1)) == 0))) | 4641 | (!len || ((len & (blocksize - 1)) == 0))) |
4642 | goto out; | 4642 | goto out; |
4643 | ret = __btrfs_delalloc_reserve_space(inode, | 4643 | ret = btrfs_delalloc_reserve_space(inode, |
4644 | round_down(from, PAGE_CACHE_SIZE), PAGE_CACHE_SIZE); | 4644 | round_down(from, PAGE_CACHE_SIZE), PAGE_CACHE_SIZE); |
4645 | if (ret) | 4645 | if (ret) |
4646 | goto out; | 4646 | goto out; |
@@ -4648,7 +4648,7 @@ int btrfs_truncate_page(struct inode *inode, loff_t from, loff_t len, | |||
4648 | again: | 4648 | again: |
4649 | page = find_or_create_page(mapping, index, mask); | 4649 | page = find_or_create_page(mapping, index, mask); |
4650 | if (!page) { | 4650 | if (!page) { |
4651 | __btrfs_delalloc_release_space(inode, | 4651 | btrfs_delalloc_release_space(inode, |
4652 | round_down(from, PAGE_CACHE_SIZE), | 4652 | round_down(from, PAGE_CACHE_SIZE), |
4653 | PAGE_CACHE_SIZE); | 4653 | PAGE_CACHE_SIZE); |
4654 | ret = -ENOMEM; | 4654 | ret = -ENOMEM; |
@@ -4718,8 +4718,8 @@ again: | |||
4718 | 4718 | ||
4719 | out_unlock: | 4719 | out_unlock: |
4720 | if (ret) | 4720 | if (ret) |
4721 | __btrfs_delalloc_release_space(inode, page_start, | 4721 | btrfs_delalloc_release_space(inode, page_start, |
4722 | PAGE_CACHE_SIZE); | 4722 | PAGE_CACHE_SIZE); |
4723 | unlock_page(page); | 4723 | unlock_page(page); |
4724 | page_cache_release(page); | 4724 | page_cache_release(page); |
4725 | out: | 4725 | out: |
@@ -7650,7 +7650,7 @@ unlock: | |||
7650 | spin_unlock(&BTRFS_I(inode)->lock); | 7650 | spin_unlock(&BTRFS_I(inode)->lock); |
7651 | } | 7651 | } |
7652 | 7652 | ||
7653 | __btrfs_free_reserved_data_space(inode, start, len); | 7653 | btrfs_free_reserved_data_space(inode, start, len); |
7654 | WARN_ON(dio_data->reserve < len); | 7654 | WARN_ON(dio_data->reserve < len); |
7655 | dio_data->reserve -= len; | 7655 | dio_data->reserve -= len; |
7656 | current->journal_info = dio_data; | 7656 | current->journal_info = dio_data; |
@@ -8440,7 +8440,7 @@ static ssize_t btrfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter, | |||
8440 | mutex_unlock(&inode->i_mutex); | 8440 | mutex_unlock(&inode->i_mutex); |
8441 | relock = true; | 8441 | relock = true; |
8442 | } | 8442 | } |
8443 | ret = __btrfs_delalloc_reserve_space(inode, offset, count); | 8443 | ret = btrfs_delalloc_reserve_space(inode, offset, count); |
8444 | if (ret) | 8444 | if (ret) |
8445 | goto out; | 8445 | goto out; |
8446 | dio_data.outstanding_extents = div64_u64(count + | 8446 | dio_data.outstanding_extents = div64_u64(count + |
@@ -8469,11 +8469,11 @@ static ssize_t btrfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter, | |||
8469 | current->journal_info = NULL; | 8469 | current->journal_info = NULL; |
8470 | if (ret < 0 && ret != -EIOCBQUEUED) { | 8470 | if (ret < 0 && ret != -EIOCBQUEUED) { |
8471 | if (dio_data.reserve) | 8471 | if (dio_data.reserve) |
8472 | __btrfs_delalloc_release_space(inode, offset, | 8472 | btrfs_delalloc_release_space(inode, offset, |
8473 | dio_data.reserve); | 8473 | dio_data.reserve); |
8474 | } else if (ret >= 0 && (size_t)ret < count) | 8474 | } else if (ret >= 0 && (size_t)ret < count) |
8475 | __btrfs_delalloc_release_space(inode, offset, | 8475 | btrfs_delalloc_release_space(inode, offset, |
8476 | count - (size_t)ret); | 8476 | count - (size_t)ret); |
8477 | } | 8477 | } |
8478 | out: | 8478 | out: |
8479 | if (wakeup) | 8479 | if (wakeup) |
@@ -8684,8 +8684,8 @@ int btrfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) | |||
8684 | page_start = page_offset(page); | 8684 | page_start = page_offset(page); |
8685 | page_end = page_start + PAGE_CACHE_SIZE - 1; | 8685 | page_end = page_start + PAGE_CACHE_SIZE - 1; |
8686 | 8686 | ||
8687 | ret = __btrfs_delalloc_reserve_space(inode, page_start, | 8687 | ret = btrfs_delalloc_reserve_space(inode, page_start, |
8688 | PAGE_CACHE_SIZE); | 8688 | PAGE_CACHE_SIZE); |
8689 | if (!ret) { | 8689 | if (!ret) { |
8690 | ret = file_update_time(vma->vm_file); | 8690 | ret = file_update_time(vma->vm_file); |
8691 | reserved = 1; | 8691 | reserved = 1; |
@@ -8780,7 +8780,7 @@ out_unlock: | |||
8780 | } | 8780 | } |
8781 | unlock_page(page); | 8781 | unlock_page(page); |
8782 | out: | 8782 | out: |
8783 | __btrfs_delalloc_release_space(inode, page_start, PAGE_CACHE_SIZE); | 8783 | btrfs_delalloc_release_space(inode, page_start, PAGE_CACHE_SIZE); |
8784 | out_noreserve: | 8784 | out_noreserve: |
8785 | sb_end_pagefault(inode->i_sb); | 8785 | sb_end_pagefault(inode->i_sb); |
8786 | return ret; | 8786 | return ret; |