diff options
| author | Misono Tomohiro <misono.tomohiro@jp.fujitsu.com> | 2018-08-02 10:19:07 +0300 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2018-08-06 14:13:02 +0300 |
| commit | 672d599041c862dd61a1576c32e946ef0d77aa34 (patch) | |
| tree | 73d4d2cd0073a7c50ef7723e51393c825af2b43d /fs/btrfs/scrub.c | |
| parent | f5b3a4173ff624b766c56936bb315e1517603891 (diff) | |
| download | linux-672d599041c862dd61a1576c32e946ef0d77aa34.tar.xz | |
btrfs: Use wrapper macro for rcu string to remove duplicate code
Cleanup patch and no functional changes.
Signed-off-by: Misono Tomohiro <misono.tomohiro@jp.fujitsu.com>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/scrub.c')
| -rw-r--r-- | fs/btrfs/scrub.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c index c4eb9eca13b8..3be1456b5116 100644 --- a/fs/btrfs/scrub.c +++ b/fs/btrfs/scrub.c @@ -3779,7 +3779,6 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start, struct scrub_ctx *sctx; int ret; struct btrfs_device *dev; - struct rcu_string *name; if (btrfs_fs_closing(fs_info)) return -EINVAL; @@ -3833,11 +3832,8 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start, if (!is_dev_replace && !readonly && !test_bit(BTRFS_DEV_STATE_WRITEABLE, &dev->dev_state)) { mutex_unlock(&fs_info->fs_devices->device_list_mutex); - rcu_read_lock(); - name = rcu_dereference(dev->name); - btrfs_err(fs_info, "scrub: device %s is not writable", - name->str); - rcu_read_unlock(); + btrfs_err_in_rcu(fs_info, "scrub: device %s is not writable", + rcu_str_deref(dev->name)); return -EROFS; } |