btrfs: zoned: allow preallocation for relocation inodes

BugLink: https://bugs.launchpad.net/bugs/1951820
commit 960a3166aed015887cd54423a6589ae4d0b65bd5 upstream

Now that we use a dedicated block group and regular writes for data
relocation, we can preallocate the space needed for a relocated inode,
just like we do in regular mode.

Essentially this reverts commit 32430c614844 ("btrfs: zoned: enable
relocation on a zoned filesystem") as it is not needed anymore.

Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 2e4f109723afd2bb00c2f925a6fd5576cbae8f86..d81bee621d3738f6015338cff7231bb49adc6a38 100644 (file)
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -2852,31 +2852,6 @@ static noinline_for_stack int prealloc_file_extent_cluster(
        if (ret)
                return ret;
 
-       /*
-        * On a zoned filesystem, we cannot preallocate the file region.
-        * Instead, we dirty and fiemap_write the region.
-        */
-       if (btrfs_is_zoned(inode->root->fs_info)) {
-               struct btrfs_root *root = inode->root;
-               struct btrfs_trans_handle *trans;
-
-               end = cluster->end - offset + 1;
-               trans = btrfs_start_transaction(root, 1);
-               if (IS_ERR(trans))
-                       return PTR_ERR(trans);
-
-               inode->vfs_inode.i_ctime = current_time(&inode->vfs_inode);
-               i_size_write(&inode->vfs_inode, end);
-               ret = btrfs_update_inode(trans, root, inode);
-               if (ret) {
-                       btrfs_abort_transaction(trans, ret);
-                       btrfs_end_transaction(trans);
-                       return ret;
-               }
-
-               return btrfs_end_transaction(trans);
-       }
-
        btrfs_inode_lock(&inode->vfs_inode, 0);
        for (nr = 0; nr < cluster->nr; nr++) {
                start = cluster->boundary[nr] - offset;
@@ -3084,7 +3059,6 @@ release_page:
 static int relocate_file_extent_cluster(struct inode *inode,
                                        struct file_extent_cluster *cluster)
 {
-       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        u64 offset = BTRFS_I(inode)->index_cnt;
        unsigned long index;
        unsigned long last_index;
@@ -3114,8 +3088,6 @@ static int relocate_file_extent_cluster(struct inode *inode,
        for (index = (cluster->start - offset) >> PAGE_SHIFT;
             index <= last_index && !ret; index++)
                ret = relocate_one_page(inode, ra, cluster, &cluster_nr, index);
-       if (btrfs_is_zoned(fs_info) && !ret)
-               ret = btrfs_wait_ordered_range(inode, 0, (u64)-1);
        if (ret == 0)
                WARN_ON(cluster_nr != cluster->nr);
 out:
@@ -3770,12 +3742,8 @@ static int __insert_orphan_inode(struct btrfs_trans_handle *trans,
        struct btrfs_path *path;
        struct btrfs_inode_item *item;
        struct extent_buffer *leaf;
-       u64 flags = BTRFS_INODE_NOCOMPRESS | BTRFS_INODE_PREALLOC;
        int ret;
 
-       if (btrfs_is_zoned(trans->fs_info))
-               flags &= ~BTRFS_INODE_PREALLOC;
-
        path = btrfs_alloc_path();
        if (!path)
                return -ENOMEM;
@@ -3790,7 +3758,8 @@ static int __insert_orphan_inode(struct btrfs_trans_handle *trans,
        btrfs_set_inode_generation(leaf, item, 1);
        btrfs_set_inode_size(leaf, item, 0);
        btrfs_set_inode_mode(leaf, item, S_IFREG | 0600);
-       btrfs_set_inode_flags(leaf, item, flags);
+       btrfs_set_inode_flags(leaf, item, BTRFS_INODE_NOCOMPRESS |
+                                         BTRFS_INODE_PREALLOC);
        btrfs_mark_buffer_dirty(leaf);
 out:
        btrfs_free_path(path);