btrfs: zoned: encapsulate inode locking for zoned relocation

[ Upstream commit 869f4cdc73f9378986755030c684c011f0b71517 ]

Encapsulate the inode lock needed for serializing the data relocation
writes on a zoned filesystem into a helper.

This streamlines the code reading flow and hides special casing for
zoned filesystems.

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
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: Sasha Levin <sashal@kernel.org>

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 6dd375e..059bd07 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -5139,8 +5139,6 @@ int extent_writepages(struct address_space *mapping,
                      struct writeback_control *wbc)
 {
        struct inode *inode = mapping->host;
-       const bool data_reloc = btrfs_is_data_reloc_root(BTRFS_I(inode)->root);
-       const bool zoned = btrfs_is_zoned(BTRFS_I(inode)->root->fs_info);
        int ret = 0;
        struct extent_page_data epd = {
                .bio_ctrl = { 0 },
@@ -5152,11 +5150,9 @@ int extent_writepages(struct address_space *mapping,
         * Allow only a single thread to do the reloc work in zoned mode to
         * protect the write pointer updates.
         */
-       if (data_reloc && zoned)
-               btrfs_inode_lock(inode, 0);
+       btrfs_zoned_data_reloc_lock(BTRFS_I(inode));
        ret = extent_write_cache_pages(mapping, wbc, &epd);
-       if (data_reloc && zoned)
-               btrfs_inode_unlock(inode, 0);
+       btrfs_zoned_data_reloc_unlock(BTRFS_I(inode));
        ASSERT(ret <= 0);
        if (ret < 0) {
                end_write_bio(&epd, ret);

diff --git a/fs/btrfs/zoned.h b/fs/btrfs/zoned.h
index 813aa3c..d680c3e 100644 (file)
--- a/fs/btrfs/zoned.h
+++ b/fs/btrfs/zoned.h
@@ -8,6 +8,7 @@
 #include "volumes.h"
 #include "disk-io.h"
 #include "block-group.h"
+#include "btrfs_inode.h"
 
 /*
  * Block groups with more than this value (percents) of unusable space will be
@@ -324,4 +325,20 @@ static inline void btrfs_clear_treelog_bg(struct btrfs_block_group *bg)
        spin_unlock(&fs_info->treelog_bg_lock);
 }
 
+static inline void btrfs_zoned_data_reloc_lock(struct btrfs_inode *inode)
+{
+       struct btrfs_root *root = inode->root;
+
+       if (btrfs_is_data_reloc_root(root) && btrfs_is_zoned(root->fs_info))
+               btrfs_inode_lock(&inode->vfs_inode, 0);
+}
+
+static inline void btrfs_zoned_data_reloc_unlock(struct btrfs_inode *inode)
+{
+       struct btrfs_root *root = inode->root;
+
+       if (btrfs_is_data_reloc_root(root) && btrfs_is_zoned(root->fs_info))
+               btrfs_inode_unlock(&inode->vfs_inode, 0);
+}
+
 #endif