On Wed 27-09-23 15:21:14, Christian Brauner wrote:
> We have bdev_mark_dead() etc and we're going to move block device
> freezing to holder ops in the next patch. Make the naming consistent:
>
> * freeze_bdev() -> bdev_freeze()
> * thaw_bdev() -> bdev_thaw()
>
> Also document the return code.
>
> Signed-off-by: Christian Brauner <brauner@xxxxxxxxxx>
Looks good to me. Feel free to add:
Reviewed-by: Jan Kara <jack@xxxxxxx>
Honza
> ---
> block/bdev.c | 22 +++++++++++++---------
> drivers/md/dm.c | 4 ++--
> fs/ext4/ioctl.c | 4 ++--
> fs/f2fs/file.c | 4 ++--
> fs/super.c | 4 ++--
> fs/xfs/xfs_fsops.c | 4 ++--
> include/linux/blkdev.h | 4 ++--
> 7 files changed, 25 insertions(+), 21 deletions(-)
>
> diff --git a/block/bdev.c b/block/bdev.c
> index f3b13aa1b7d4..0d27db3e69e7 100644
> --- a/block/bdev.c
> +++ b/block/bdev.c
> @@ -207,18 +207,20 @@ int sync_blockdev_range(struct block_device *bdev, loff_t lstart, loff_t lend)
> EXPORT_SYMBOL(sync_blockdev_range);
>
> /**
> - * freeze_bdev - lock a filesystem and force it into a consistent state
> + * bdev_freeze - lock a filesystem and force it into a consistent state
> * @bdev: blockdevice to lock
> *
> * If a superblock is found on this device, we take the s_umount semaphore
> * on it to make sure nobody unmounts until the snapshot creation is done.
> * The reference counter (bd_fsfreeze_count) guarantees that only the last
> * unfreeze process can unfreeze the frozen filesystem actually when multiple
> - * freeze requests arrive simultaneously. It counts up in freeze_bdev() and
> - * count down in thaw_bdev(). When it becomes 0, thaw_bdev() will unfreeze
> + * freeze requests arrive simultaneously. It counts up in bdev_freeze() and
> + * count down in bdev_thaw(). When it becomes 0, thaw_bdev() will unfreeze
> * actually.
> + *
> + * Return: On success zero is returned, negative error code on failure.
> */
> -int freeze_bdev(struct block_device *bdev)
> +int bdev_freeze(struct block_device *bdev)
> {
> struct super_block *sb;
> int error = 0;
> @@ -248,15 +250,17 @@ int freeze_bdev(struct block_device *bdev)
> mutex_unlock(&bdev->bd_fsfreeze_mutex);
> return error;
> }
> -EXPORT_SYMBOL(freeze_bdev);
> +EXPORT_SYMBOL(bdev_freeze);
>
> /**
> - * thaw_bdev - unlock filesystem
> + * bdev_thaw - unlock filesystem
> * @bdev: blockdevice to unlock
> *
> - * Unlocks the filesystem and marks it writeable again after freeze_bdev().
> + * Unlocks the filesystem and marks it writeable again after bdev_freeze().
> + *
> + * Return: On success zero is returned, negative error code on failure.
> */
> -int thaw_bdev(struct block_device *bdev)
> +int bdev_thaw(struct block_device *bdev)
> {
> struct super_block *sb;
> int error = -EINVAL;
> @@ -285,7 +289,7 @@ int thaw_bdev(struct block_device *bdev)
> mutex_unlock(&bdev->bd_fsfreeze_mutex);
> return error;
> }
> -EXPORT_SYMBOL(thaw_bdev);
> +EXPORT_SYMBOL(bdev_thaw);
>
> /*
> * pseudo-fs
> diff --git a/drivers/md/dm.c b/drivers/md/dm.c
> index 64a1f306c96c..6fa309e8efb0 100644
> --- a/drivers/md/dm.c
> +++ b/drivers/md/dm.c
> @@ -2648,7 +2648,7 @@ static int lock_fs(struct mapped_device *md)
>
> WARN_ON(test_bit(DMF_FROZEN, &md->flags));
>
> - r = freeze_bdev(md->disk->part0);
> + r = bdev_freeze(md->disk->part0);
> if (!r)
> set_bit(DMF_FROZEN, &md->flags);
> return r;
> @@ -2658,7 +2658,7 @@ static void unlock_fs(struct mapped_device *md)
> {
> if (!test_bit(DMF_FROZEN, &md->flags))
> return;
> - thaw_bdev(md->disk->part0);
> + bdev_thaw(md->disk->part0);
> clear_bit(DMF_FROZEN, &md->flags);
> }
>
> diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
> index 0bfe2ce589e2..c1390219c945 100644
> --- a/fs/ext4/ioctl.c
> +++ b/fs/ext4/ioctl.c
> @@ -810,11 +810,11 @@ int ext4_force_shutdown(struct super_block *sb, u32 flags)
>
> switch (flags) {
> case EXT4_GOING_FLAGS_DEFAULT:
> - ret = freeze_bdev(sb->s_bdev);
> + ret = bdev_freeze(sb->s_bdev);
> if (ret)
> return ret;
> set_bit(EXT4_FLAGS_SHUTDOWN, &sbi->s_ext4_flags);
> - thaw_bdev(sb->s_bdev);
> + bdev_thaw(sb->s_bdev);
> break;
> case EXT4_GOING_FLAGS_LOGFLUSH:
> set_bit(EXT4_FLAGS_SHUTDOWN, &sbi->s_ext4_flags);
> diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
> index ca5904129b16..c22aeb9ffb61 100644
> --- a/fs/f2fs/file.c
> +++ b/fs/f2fs/file.c
> @@ -2239,11 +2239,11 @@ static int f2fs_ioc_shutdown(struct file *filp, unsigned long arg)
>
> switch (in) {
> case F2FS_GOING_DOWN_FULLSYNC:
> - ret = freeze_bdev(sb->s_bdev);
> + ret = bdev_freeze(sb->s_bdev);
> if (ret)
> goto out;
> f2fs_stop_checkpoint(sbi, false, STOP_CP_REASON_SHUTDOWN);
> - thaw_bdev(sb->s_bdev);
> + bdev_thaw(sb->s_bdev);
> break;
> case F2FS_GOING_DOWN_METASYNC:
> /* do checkpoint only */
> diff --git a/fs/super.c b/fs/super.c
> index 2d762ce67f6e..e54866345dc7 100644
> --- a/fs/super.c
> +++ b/fs/super.c
> @@ -1210,7 +1210,7 @@ static void do_thaw_all_callback(struct super_block *sb)
>
> if (born && sb->s_root) {
> if (IS_ENABLED(CONFIG_BLOCK))
> - while (sb->s_bdev && !thaw_bdev(sb->s_bdev))
> + while (sb->s_bdev && !bdev_thaw(sb->s_bdev))
> pr_warn("Emergency Thaw on %pg\n", sb->s_bdev);
> thaw_super_locked(sb, FREEZE_HOLDER_USERSPACE);
> } else {
> @@ -1501,7 +1501,7 @@ int setup_bdev_super(struct super_block *sb, int sb_flags,
> /*
> * Until SB_BORN flag is set, there can be no active superblock
> * references and thus no filesystem freezing. get_active_super() will
> - * just loop waiting for SB_BORN so even freeze_bdev() cannot proceed.
> + * just loop waiting for SB_BORN so even bdev_freeze() cannot proceed.
> *
> * It is enough to check bdev was not frozen before we set s_bdev.
> */
> diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
> index 7cb75cb6b8e9..57076a25f17d 100644
> --- a/fs/xfs/xfs_fsops.c
> +++ b/fs/xfs/xfs_fsops.c
> @@ -482,9 +482,9 @@ xfs_fs_goingdown(
> {
> switch (inflags) {
> case XFS_FSOP_GOING_FLAGS_DEFAULT: {
> - if (!freeze_bdev(mp->m_super->s_bdev)) {
> + if (!bdev_freeze(mp->m_super->s_bdev)) {
> xfs_force_shutdown(mp, SHUTDOWN_FORCE_UMOUNT);
> - thaw_bdev(mp->m_super->s_bdev);
> + bdev_thaw(mp->m_super->s_bdev);
> }
> break;
> }
> diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
> index eef450f25982..bf25b63e13d5 100644
> --- a/include/linux/blkdev.h
> +++ b/include/linux/blkdev.h
> @@ -1530,8 +1530,8 @@ static inline int early_lookup_bdev(const char *pathname, dev_t *dev)
> }
> #endif /* CONFIG_BLOCK */
>
> -int freeze_bdev(struct block_device *bdev);
> -int thaw_bdev(struct block_device *bdev);
> +int bdev_freeze(struct block_device *bdev);
> +int bdev_thaw(struct block_device *bdev);
>
> struct io_comp_batch {
> struct request *req_list;
>
> --
> 2.34.1
>
--
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR
