diff options
Diffstat (limited to 'fs/btrfs/file.c')
-rw-r--r-- | fs/btrfs/file.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 571ad3c13b47..1be96ba6f6bb 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c | |||
@@ -123,7 +123,10 @@ static noinline int dirty_and_release_pages(struct btrfs_trans_handle *trans, | |||
123 | root->sectorsize - 1) & ~((u64)root->sectorsize - 1); | 123 | root->sectorsize - 1) & ~((u64)root->sectorsize - 1); |
124 | 124 | ||
125 | end_of_last_block = start_pos + num_bytes - 1; | 125 | end_of_last_block = start_pos + num_bytes - 1; |
126 | btrfs_set_extent_delalloc(inode, start_pos, end_of_last_block); | 126 | err = btrfs_set_extent_delalloc(inode, start_pos, end_of_last_block); |
127 | if (err) | ||
128 | return err; | ||
129 | |||
127 | for (i = 0; i < num_pages; i++) { | 130 | for (i = 0; i < num_pages; i++) { |
128 | struct page *p = pages[i]; | 131 | struct page *p = pages[i]; |
129 | SetPageUptodate(p); | 132 | SetPageUptodate(p); |
@@ -927,6 +930,11 @@ static ssize_t btrfs_file_write(struct file *file, const char __user *buf, | |||
927 | err = file_remove_suid(file); | 930 | err = file_remove_suid(file); |
928 | if (err) | 931 | if (err) |
929 | goto out_nolock; | 932 | goto out_nolock; |
933 | |||
934 | err = btrfs_reserve_metadata_for_delalloc(root, inode, 1); | ||
935 | if (err) | ||
936 | goto out_nolock; | ||
937 | |||
930 | file_update_time(file); | 938 | file_update_time(file); |
931 | 939 | ||
932 | pages = kmalloc(nrptrs * sizeof(struct page *), GFP_KERNEL); | 940 | pages = kmalloc(nrptrs * sizeof(struct page *), GFP_KERNEL); |
@@ -1028,6 +1036,7 @@ out: | |||
1028 | mutex_unlock(&inode->i_mutex); | 1036 | mutex_unlock(&inode->i_mutex); |
1029 | if (ret) | 1037 | if (ret) |
1030 | err = ret; | 1038 | err = ret; |
1039 | btrfs_unreserve_metadata_for_delalloc(root, inode, 1); | ||
1031 | 1040 | ||
1032 | out_nolock: | 1041 | out_nolock: |
1033 | kfree(pages); | 1042 | kfree(pages); |