nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

btrfs: zoned: encapsulate inode locking for zoned relocation

Browse source 
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>
This commit is contained in:
Johannes Thumshirn 2021-12-07 06:28:34 -08:00 committed by David Sterba
parent a26d60dedf
commit 869f4cdc73
2 changed files with 19 additions and 6 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

8
fs/btrfs/extent_io.c
View file

@ -5184,8 +5184,6 @@ int extent_writepages(struct address_space *mapping,
struct writeback_control *wbc) struct writeback_control *wbc)
{ {
struct inode *inode = mapping->host; 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; int ret = 0;
struct extent_page_data epd = { struct extent_page_data epd = {
.bio_ctrl = { 0 }, .bio_ctrl = { 0 },
@ -5197,11 +5195,9 @@ int extent_writepages(struct address_space *mapping,
* Allow only a single thread to do the reloc work in zoned mode to * Allow only a single thread to do the reloc work in zoned mode to
* protect the write pointer updates. * protect the write pointer updates.
*/ */
if (data_reloc && zoned) btrfs_zoned_data_reloc_lock(BTRFS_I(inode));
btrfs_inode_lock(inode, 0);
ret = extent_write_cache_pages(mapping, wbc, &epd); ret = extent_write_cache_pages(mapping, wbc, &epd);
if (data_reloc && zoned) btrfs_zoned_data_reloc_unlock(BTRFS_I(inode));
btrfs_inode_unlock(inode, 0);
ASSERT(ret <= 0); ASSERT(ret <= 0);
if (ret < 0) { if (ret < 0) {
end_write_bio(&epd, ret); end_write_bio(&epd, ret);

17
fs/btrfs/zoned.h
View file

@ -8,6 +8,7 @@
#include "volumes.h" #include "volumes.h"
#include "disk-io.h" #include "disk-io.h"
#include "block-group.h" #include "block-group.h"
#include "btrfs_inode.h"
/* /*
* Block groups with more than this value (percents) of unusable space will be * Block groups with more than this value (percents) of unusable space will be
@ -354,4 +355,20 @@ static inline void btrfs_clear_treelog_bg(struct btrfs_block_group *bg)
spin_unlock(&fs_info->treelog_bg_lock); 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 #endif