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: Filipe Manana <fdmanana@suse.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 200eb14b6721d51dcf900c9a240a4be68aab5fba..06a2f0f2e602f30a0a08b2be23cff682d2f6a246 100644 (file)
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -2967,7 +2967,7 @@ static int btrfs_fallocate_update_isize(struct inode *inode,
 
        inode->i_ctime = current_time(inode);
        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);
        ret2 = btrfs_end_transaction(trans);
 

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 2865de52dc22aac3e6be8ef74db39333cf924f2b..8b801a1e78455fec9f3399d538e79e1669ead2b3 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2550,7 +2550,7 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent)
                 */
                btrfs_qgroup_free_data(inode, NULL, start,
                                       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)
                        trans = btrfs_join_transaction_spacecache(root);
                else
@@ -2621,7 +2621,7 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent)
                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);
        if (ret) { /* -ENOMEM or corruption */
                btrfs_abort_transaction(trans, ret);
@@ -4411,7 +4411,7 @@ out:
                ASSERT(last_size >= new_size);
                if (!ret && 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,
                                     (u64)-1, &cached_state);
        }
@@ -4740,7 +4740,7 @@ static int btrfs_setsize(struct inode *inode, struct iattr *attr)
                }
 
                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);
                ret = btrfs_update_inode(trans, root, inode);
                btrfs_end_write_no_snapshotting(root);
@@ -8727,7 +8727,7 @@ static int btrfs_truncate(struct inode *inode, bool skip_writeback)
                        ret = PTR_ERR(trans);
                        goto out;
                }
-               btrfs_ordered_update_i_size(inode, inode->i_size, NULL);
+               btrfs_inode_safe_disk_i_size_write(inode, 0);
        }
 
        if (trans) {
@@ -9996,7 +9996,7 @@ next:
                        else
                                i_size = cur_offset;
                        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);

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 1bff1b6cd6283d0692ca5b51fa8ffe8c7b1fa553..ba1608d0cd8ec3c3b7114febdb5b078b05c3cda3 100644 (file)
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -3323,7 +3323,7 @@ static int clone_finish_inode_update(struct btrfs_trans_handle *trans,
                endoff = destoff + olen;
        if (endoff > inode->i_size) {
                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);