* [PATCH 1/1] btrfs: open code btrfs_init_dev_replace_tgtdev_for_resume()
@ 2018-02-12 15:36 Anand Jain
2018-02-12 17:00 ` David Sterba
2018-02-13 1:48 ` Qu Wenruo
0 siblings, 2 replies; 3+ messages in thread
From: Anand Jain @ 2018-02-12 15:36 UTC (permalink / raw)
To: linux-btrfs
btrfs_init_dev_replace_tgtdev_for_resume() initializes replace
target device in few simple steps, so do it at the parent function.
Moreover, there isn't any other caller so just open code it.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
fs/btrfs/dev-replace.c | 10 ++++++++--
fs/btrfs/volumes.c | 13 -------------
fs/btrfs/volumes.h | 2 --
3 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index 7efbc4d1128b..197be3fe307b 100644
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -174,8 +174,14 @@ int btrfs_init_dev_replace(struct btrfs_fs_info *fs_info)
}
set_bit(BTRFS_DEV_STATE_REPLACE_TGT,
&dev_replace->tgtdev->dev_state);
- btrfs_init_dev_replace_tgtdev_for_resume(fs_info,
- dev_replace->tgtdev);
+
+ WARN_ON(fs_info->fs_devices->rw_devices == 0);
+ dev_replace->tgtdev->io_width = fs_info->sectorsize;
+ dev_replace->tgtdev->io_align = fs_info->sectorsize;
+ dev_replace->tgtdev->sector_size = fs_info->sectorsize;
+ dev_replace->tgtdev->fs_info = fs_info;
+ set_bit(BTRFS_DEV_STATE_IN_FS_METADATA,
+ &dev_replace->tgtdev->dev_state);
}
break;
}
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index bbdcf50cd65b..28c385d6419a 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -2681,19 +2681,6 @@ int btrfs_init_dev_replace_tgtdev(struct btrfs_fs_info *fs_info,
return ret;
}
-void btrfs_init_dev_replace_tgtdev_for_resume(struct btrfs_fs_info *fs_info,
- struct btrfs_device *tgtdev)
-{
- u32 sectorsize = fs_info->sectorsize;
-
- WARN_ON(fs_info->fs_devices->rw_devices == 0);
- tgtdev->io_width = sectorsize;
- tgtdev->io_align = sectorsize;
- tgtdev->sector_size = sectorsize;
- tgtdev->fs_info = fs_info;
- set_bit(BTRFS_DEV_STATE_IN_FS_METADATA, &tgtdev->dev_state);
-}
-
static noinline int btrfs_update_device(struct btrfs_trans_handle *trans,
struct btrfs_device *device)
{
diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
index 7281f55dea05..c69d8b4eb4c6 100644
--- a/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h
@@ -483,8 +483,6 @@ void btrfs_rm_dev_replace_free_srcdev(struct btrfs_fs_info *fs_info,
struct btrfs_device *srcdev);
void btrfs_destroy_dev_replace_tgtdev(struct btrfs_fs_info *fs_info,
struct btrfs_device *tgtdev);
-void btrfs_init_dev_replace_tgtdev_for_resume(struct btrfs_fs_info *fs_info,
- struct btrfs_device *tgtdev);
void btrfs_scratch_superblocks(struct block_device *bdev, const char *device_path);
int btrfs_is_parity_mirror(struct btrfs_fs_info *fs_info,
u64 logical, u64 len);
--
2.15.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 1/1] btrfs: open code btrfs_init_dev_replace_tgtdev_for_resume()
2018-02-12 15:36 [PATCH 1/1] btrfs: open code btrfs_init_dev_replace_tgtdev_for_resume() Anand Jain
@ 2018-02-12 17:00 ` David Sterba
2018-02-13 1:48 ` Qu Wenruo
1 sibling, 0 replies; 3+ messages in thread
From: David Sterba @ 2018-02-12 17:00 UTC (permalink / raw)
To: Anand Jain; +Cc: linux-btrfs
On Mon, Feb 12, 2018 at 11:36:25PM +0800, Anand Jain wrote:
> btrfs_init_dev_replace_tgtdev_for_resume() initializes replace
> target device in few simple steps, so do it at the parent function.
> Moreover, there isn't any other caller so just open code it.
Makes sense,
Reviewed-by: David Sterba <dsterba@suse.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] btrfs: open code btrfs_init_dev_replace_tgtdev_for_resume()
2018-02-12 15:36 [PATCH 1/1] btrfs: open code btrfs_init_dev_replace_tgtdev_for_resume() Anand Jain
2018-02-12 17:00 ` David Sterba
@ 2018-02-13 1:48 ` Qu Wenruo
1 sibling, 0 replies; 3+ messages in thread
From: Qu Wenruo @ 2018-02-13 1:48 UTC (permalink / raw)
To: Anand Jain, linux-btrfs
[-- Attachment #1.1: Type: text/plain, Size: 2968 bytes --]
On 2018年02月12日 23:36, Anand Jain wrote:
> btrfs_init_dev_replace_tgtdev_for_resume() initializes replace
> target device in few simple steps, so do it at the parent function.
> Moreover, there isn't any other caller so just open code it.
>
> Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Thanks,
Qu
> ---
> fs/btrfs/dev-replace.c | 10 ++++++++--
> fs/btrfs/volumes.c | 13 -------------
> fs/btrfs/volumes.h | 2 --
> 3 files changed, 8 insertions(+), 17 deletions(-)
>
> diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
> index 7efbc4d1128b..197be3fe307b 100644
> --- a/fs/btrfs/dev-replace.c
> +++ b/fs/btrfs/dev-replace.c
> @@ -174,8 +174,14 @@ int btrfs_init_dev_replace(struct btrfs_fs_info *fs_info)
> }
> set_bit(BTRFS_DEV_STATE_REPLACE_TGT,
> &dev_replace->tgtdev->dev_state);
> - btrfs_init_dev_replace_tgtdev_for_resume(fs_info,
> - dev_replace->tgtdev);
> +
> + WARN_ON(fs_info->fs_devices->rw_devices == 0);
> + dev_replace->tgtdev->io_width = fs_info->sectorsize;
> + dev_replace->tgtdev->io_align = fs_info->sectorsize;
> + dev_replace->tgtdev->sector_size = fs_info->sectorsize;
> + dev_replace->tgtdev->fs_info = fs_info;
> + set_bit(BTRFS_DEV_STATE_IN_FS_METADATA,
> + &dev_replace->tgtdev->dev_state);
> }
> break;
> }
> diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
> index bbdcf50cd65b..28c385d6419a 100644
> --- a/fs/btrfs/volumes.c
> +++ b/fs/btrfs/volumes.c
> @@ -2681,19 +2681,6 @@ int btrfs_init_dev_replace_tgtdev(struct btrfs_fs_info *fs_info,
> return ret;
> }
>
> -void btrfs_init_dev_replace_tgtdev_for_resume(struct btrfs_fs_info *fs_info,
> - struct btrfs_device *tgtdev)
> -{
> - u32 sectorsize = fs_info->sectorsize;
> -
> - WARN_ON(fs_info->fs_devices->rw_devices == 0);
> - tgtdev->io_width = sectorsize;
> - tgtdev->io_align = sectorsize;
> - tgtdev->sector_size = sectorsize;
> - tgtdev->fs_info = fs_info;
> - set_bit(BTRFS_DEV_STATE_IN_FS_METADATA, &tgtdev->dev_state);
> -}
> -
> static noinline int btrfs_update_device(struct btrfs_trans_handle *trans,
> struct btrfs_device *device)
> {
> diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
> index 7281f55dea05..c69d8b4eb4c6 100644
> --- a/fs/btrfs/volumes.h
> +++ b/fs/btrfs/volumes.h
> @@ -483,8 +483,6 @@ void btrfs_rm_dev_replace_free_srcdev(struct btrfs_fs_info *fs_info,
> struct btrfs_device *srcdev);
> void btrfs_destroy_dev_replace_tgtdev(struct btrfs_fs_info *fs_info,
> struct btrfs_device *tgtdev);
> -void btrfs_init_dev_replace_tgtdev_for_resume(struct btrfs_fs_info *fs_info,
> - struct btrfs_device *tgtdev);
> void btrfs_scratch_superblocks(struct block_device *bdev, const char *device_path);
> int btrfs_is_parity_mirror(struct btrfs_fs_info *fs_info,
> u64 logical, u64 len);
>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 520 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-02-13 1:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-12 15:36 [PATCH 1/1] btrfs: open code btrfs_init_dev_replace_tgtdev_for_resume() Anand Jain
2018-02-12 17:00 ` David Sterba
2018-02-13 1:48 ` Qu Wenruo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).