diff options
| author | Johannes Thumshirn <johannes.thumshirn@wdc.com> | 2020-09-11 17:56:49 +0900 |
|---|---|---|
| committer | Damien Le Moal <damien.lemoal@wdc.com> | 2020-09-15 18:32:48 +0900 |
| commit | 48d546a8dad4c09745d464e12b95f21c773bff39 (patch) | |
| tree | e5823579e95010197fb38a5a6de47b99d58b03bc /fs/zonefs | |
| parent | 5498d5f93210ab4c55cd191473c8f4a59cc68e8e (diff) | |
| download | linux-48d546a8dad4c09745d464e12b95f21c773bff39.tar.gz | |
zonefs: provide no-lock zonefs_io_error variant
Subsequent patches need to call zonefs_io_error() with the i_truncate_mutex already held, so factor out the body of zonefs_io_error() into __zonefs_io_error() which can be called from with the i_truncate_mutex held. Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com> Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
Diffstat (limited to 'fs/zonefs')
| -rw-r--r-- | fs/zonefs/super.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/fs/zonefs/super.c b/fs/zonefs/super.c index 6e13a5127b01..4309979eeb36 100644 --- a/fs/zonefs/super.c +++ b/fs/zonefs/super.c @@ -348,7 +348,7 @@ static int zonefs_io_error_cb(struct blk_zone *zone, unsigned int idx, * eventually correct the file size and zonefs inode write pointer offset * (which can be out of sync with the drive due to partial write failures). */ -static void zonefs_io_error(struct inode *inode, bool write) +static void __zonefs_io_error(struct inode *inode, bool write) { struct zonefs_inode_info *zi = ZONEFS_I(inode); struct super_block *sb = inode->i_sb; @@ -362,8 +362,6 @@ static void zonefs_io_error(struct inode *inode, bool write) }; int ret; - mutex_lock(&zi->i_truncate_mutex); - /* * Memory allocations in blkdev_report_zones() can trigger a memory * reclaim which may in turn cause a recursion into zonefs as well as @@ -379,7 +377,14 @@ static void zonefs_io_error(struct inode *inode, bool write) zonefs_err(sb, "Get inode %lu zone information failed %d\n", inode->i_ino, ret); memalloc_noio_restore(noio_flag); +} +static void zonefs_io_error(struct inode *inode, bool write) +{ + struct zonefs_inode_info *zi = ZONEFS_I(inode); + + mutex_lock(&zi->i_truncate_mutex); + __zonefs_io_error(inode, write); mutex_unlock(&zi->i_truncate_mutex); } |