Re: [PATCH] btrfs: add helper for device path or missing

[Anand Jain]

On 12/05/2017 03:31 AM, David Sterba wrote:

On Tue, Nov 28, 2017 at 10:43:10AM +0800, Anand Jain wrote:

This patch creates a helper function to get either the rcu device path
or missing.

Signed-off-by: Anand Jain 
---
  fs/btrfs/dev-replace.c | 22 +++---
  1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index 7c655f9a7a50..4b6ceb38cb5f 100644
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -304,6 +304,11 @@ void btrfs_after_dev_replace_commit(struct btrfs_fs_info 
*fs_info)
dev_replace->cursor_left_last_write_of_item;
  }
  
+static inline char *dev_missing_or_rcu_str(struct btrfs_device *device)

+{
+   return device->missing ? "" : rcu_str_deref(device->name);
+}


I'd change it to dev_name, as long as it stays a local helper in
dev-replace. I'm now merging the dev_state patches which depend on this
patch so I'll rename it myself so you don't have to refresh and resend
the patches.


   I am not good at naming, thanks for fixing David.
 - Anand


--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] btrfs: add helper for device path or missing

[David Sterba]

On Tue, Nov 28, 2017 at 10:43:10AM +0800, Anand Jain wrote:
> This patch creates a helper function to get either the rcu device path
> or missing.
> 
> Signed-off-by: Anand Jain 
> ---
>  fs/btrfs/dev-replace.c | 22 +++---
>  1 file changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
> index 7c655f9a7a50..4b6ceb38cb5f 100644
> --- a/fs/btrfs/dev-replace.c
> +++ b/fs/btrfs/dev-replace.c
> @@ -304,6 +304,11 @@ void btrfs_after_dev_replace_commit(struct btrfs_fs_info 
> *fs_info)
>   dev_replace->cursor_left_last_write_of_item;
>  }
>  
> +static inline char *dev_missing_or_rcu_str(struct btrfs_device *device)
> +{
> + return device->missing ? "" : rcu_str_deref(device->name);
> +}

I'd change it to dev_name, as long as it stays a local helper in
dev-replace. I'm now merging the dev_state patches which depend on this
patch so I'll rename it myself so you don't have to refresh and resend
the patches.

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] btrfs: add helper for device path or missing

[Anand Jain]

This patch creates a helper function to get either the rcu device path
or missing.

Signed-off-by: Anand Jain 
---
 fs/btrfs/dev-replace.c | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index 7c655f9a7a50..4b6ceb38cb5f 100644
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -304,6 +304,11 @@ void btrfs_after_dev_replace_commit(struct btrfs_fs_info 
*fs_info)
dev_replace->cursor_left_last_write_of_item;
 }
 
+static inline char *dev_missing_or_rcu_str(struct btrfs_device *device)
+{
+   return device->missing ? "" : rcu_str_deref(device->name);
+}
+
 int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info,
const char *tgtdev_name, u64 srcdevid, const char *srcdev_name,
int read_src)
@@ -363,8 +368,7 @@ int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info,
 
btrfs_info_in_rcu(fs_info,
  "dev_replace from %s (devid %llu) to %s started",
- src_device->missing ? "" :
-   rcu_str_deref(src_device->name),
+ dev_missing_or_rcu_str(src_device),
  src_device->devid,
  rcu_str_deref(tgt_device->name));
 
@@ -538,8 +542,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info 
*fs_info,
} else {
btrfs_err_in_rcu(fs_info,
 "btrfs_scrub_dev(%s, %llu, %s) failed %d",
-src_device->missing ? "" :
-rcu_str_deref(src_device->name),
+dev_missing_or_rcu_str(src_device),
 src_device->devid,
 rcu_str_deref(tgt_device->name), scrub_ret);
btrfs_dev_replace_unlock(dev_replace, 1);
@@ -557,8 +560,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info 
*fs_info,
 
btrfs_info_in_rcu(fs_info,
  "dev_replace from %s (devid %llu) to %s finished",
- src_device->missing ? "" :
- rcu_str_deref(src_device->name),
+ dev_missing_or_rcu_str(src_device),
  src_device->devid,
  rcu_str_deref(tgt_device->name));
tgt_device->is_tgtdev_for_dev_replace = 0;
@@ -814,12 +816,10 @@ static int btrfs_dev_replace_kthread(void *data)
progress = btrfs_dev_replace_progress(fs_info);
progress = div_u64(progress, 10);
btrfs_info_in_rcu(fs_info,
-   "continuing dev_replace from %s (devid %llu) to %s @%u%%",
-   dev_replace->srcdev->missing ? ""
-   : rcu_str_deref(dev_replace->srcdev->name),
+   "continuing dev_replace from %s (devid %llu) to target %s 
@%u%%",
+   dev_missing_or_rcu_str(dev_replace->srcdev),
dev_replace->srcdev->devid,
-   dev_replace->tgtdev ? rcu_str_deref(dev_replace->tgtdev->name)
-   : "",
+   dev_missing_or_rcu_str(dev_replace->tgtdev),
(unsigned int)progress);
 
btrfs_dev_replace_continue_on_mount(fs_info);
-- 
2.15.0

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html