Commit d923afe9 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba

btrfs: replace all uses of btrfs_ordered_update_i_size

Now that we have a safe way to update the i_size, replace all uses of
btrfs_ordered_update_i_size with btrfs_inode_safe_disk_i_size_write.
Reviewed-by: default avatarFilipe Manana <fdmanana@suse.com>
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 9ddc959e
...@@ -2967,7 +2967,7 @@ static int btrfs_fallocate_update_isize(struct inode *inode, ...@@ -2967,7 +2967,7 @@ static int btrfs_fallocate_update_isize(struct inode *inode,
inode->i_ctime = current_time(inode); inode->i_ctime = current_time(inode);
i_size_write(inode, end); i_size_write(inode, end);
btrfs_ordered_update_i_size(inode, end, NULL); btrfs_inode_safe_disk_i_size_write(inode, 0);
ret = btrfs_update_inode(trans, root, inode); ret = btrfs_update_inode(trans, root, inode);
ret2 = btrfs_end_transaction(trans); ret2 = btrfs_end_transaction(trans);
......
...@@ -2550,7 +2550,7 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent) ...@@ -2550,7 +2550,7 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent)
*/ */
btrfs_qgroup_free_data(inode, NULL, start, btrfs_qgroup_free_data(inode, NULL, start,
ordered_extent->num_bytes); ordered_extent->num_bytes);
btrfs_ordered_update_i_size(inode, 0, ordered_extent); btrfs_inode_safe_disk_i_size_write(inode, 0);
if (freespace_inode) if (freespace_inode)
trans = btrfs_join_transaction_spacecache(root); trans = btrfs_join_transaction_spacecache(root);
else else
...@@ -2621,7 +2621,7 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent) ...@@ -2621,7 +2621,7 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent)
goto out; goto out;
} }
btrfs_ordered_update_i_size(inode, 0, ordered_extent); btrfs_inode_safe_disk_i_size_write(inode, 0);
ret = btrfs_update_inode_fallback(trans, root, inode); ret = btrfs_update_inode_fallback(trans, root, inode);
if (ret) { /* -ENOMEM or corruption */ if (ret) { /* -ENOMEM or corruption */
btrfs_abort_transaction(trans, ret); btrfs_abort_transaction(trans, ret);
...@@ -4411,7 +4411,7 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, ...@@ -4411,7 +4411,7 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,
ASSERT(last_size >= new_size); ASSERT(last_size >= new_size);
if (!ret && last_size > new_size) if (!ret && last_size > new_size)
last_size = new_size; last_size = new_size;
btrfs_ordered_update_i_size(inode, last_size, NULL); btrfs_inode_safe_disk_i_size_write(inode, last_size);
unlock_extent_cached(&BTRFS_I(inode)->io_tree, lock_start, unlock_extent_cached(&BTRFS_I(inode)->io_tree, lock_start,
(u64)-1, &cached_state); (u64)-1, &cached_state);
} }
...@@ -4740,7 +4740,7 @@ static int btrfs_setsize(struct inode *inode, struct iattr *attr) ...@@ -4740,7 +4740,7 @@ static int btrfs_setsize(struct inode *inode, struct iattr *attr)
} }
i_size_write(inode, newsize); i_size_write(inode, newsize);
btrfs_ordered_update_i_size(inode, i_size_read(inode), NULL); btrfs_inode_safe_disk_i_size_write(inode, 0);
pagecache_isize_extended(inode, oldsize, newsize); pagecache_isize_extended(inode, oldsize, newsize);
ret = btrfs_update_inode(trans, root, inode); ret = btrfs_update_inode(trans, root, inode);
btrfs_end_write_no_snapshotting(root); btrfs_end_write_no_snapshotting(root);
...@@ -8727,7 +8727,7 @@ static int btrfs_truncate(struct inode *inode, bool skip_writeback) ...@@ -8727,7 +8727,7 @@ static int btrfs_truncate(struct inode *inode, bool skip_writeback)
ret = PTR_ERR(trans); ret = PTR_ERR(trans);
goto out; goto out;
} }
btrfs_ordered_update_i_size(inode, inode->i_size, NULL); btrfs_inode_safe_disk_i_size_write(inode, 0);
} }
if (trans) { if (trans) {
...@@ -9996,7 +9996,7 @@ static int __btrfs_prealloc_file_range(struct inode *inode, int mode, ...@@ -9996,7 +9996,7 @@ static int __btrfs_prealloc_file_range(struct inode *inode, int mode,
else else
i_size = cur_offset; i_size = cur_offset;
i_size_write(inode, i_size); i_size_write(inode, i_size);
btrfs_ordered_update_i_size(inode, i_size, NULL); btrfs_inode_safe_disk_i_size_write(inode, 0);
} }
ret = btrfs_update_inode(trans, root, inode); ret = btrfs_update_inode(trans, root, inode);
......
...@@ -3323,7 +3323,7 @@ static int clone_finish_inode_update(struct btrfs_trans_handle *trans, ...@@ -3323,7 +3323,7 @@ static int clone_finish_inode_update(struct btrfs_trans_handle *trans,
endoff = destoff + olen; endoff = destoff + olen;
if (endoff > inode->i_size) { if (endoff > inode->i_size) {
i_size_write(inode, endoff); i_size_write(inode, endoff);
btrfs_ordered_update_i_size(inode, endoff, NULL); btrfs_inode_safe_disk_i_size_write(inode, 0);
} }
ret = btrfs_update_inode(trans, root, inode); ret = btrfs_update_inode(trans, root, inode);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment