btrfs: rename btrfs_close_extra_device to btrfs_free_extra_devids

This function btrfs_close_extra_devices() is about freeing
extra devids which once it may have belonged to this filesystem.
So rename it and add the comment. The _devid suffix is
appropriate as this function won't handle devices which are
outside of the filesytem being mounted.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 798e602c1834c60147f951540af98e3d0b8e39ad..bbbcbf87ac93ea87c79502fbb3d7df01c1ecb3c8 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -2758,10 +2758,10 @@ int open_ctree(struct super_block *sb,
        }
 
        /*
-        * keep the device that is marked to be the target device for the
-        * dev_replace procedure
+        * Keep the devid that is marked to be the target device for the
+        * device replace procedure
         */
-       btrfs_close_extra_devices(fs_devices, 0);
+       btrfs_free_extra_devids(fs_devices, 0);
 
        if (!fs_devices->latest_bdev) {
                btrfs_err(fs_info, "failed to read devices");
@@ -2824,7 +2824,7 @@ retry_root_backup:
                goto fail_block_groups;
        }
 
-       btrfs_close_extra_devices(fs_devices, 1);
+       btrfs_free_extra_devids(fs_devices, 1);
 
        ret = btrfs_sysfs_add_fsid(fs_devices, NULL);
        if (ret) {

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index b580ef08c3682729e3c3599ba7985220d63cbc5f..1622d3b7377178d5f16bacbe9d46dfcd941f426c 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -896,7 +896,11 @@ error:
        return ERR_PTR(-ENOMEM);
 }
 
-void btrfs_close_extra_devices(struct btrfs_fs_devices *fs_devices, int step)
+/*
+ * After we have read the system tree and know devids belonging to
+ * this filesystem, remove the device which does not belong there.
+ */
+void btrfs_free_extra_devids(struct btrfs_fs_devices *fs_devices, int step)
 {
        struct btrfs_device *device, *next;
        struct btrfs_device *latest_dev = NULL;

diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
index d28f5745fee2a1018484855ddc27e0b61a7029d8..d1fcaea9fef5a10920e37864b619c6ec3b57a74d 100644 (file)
--- a/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h
@@ -422,7 +422,7 @@ int btrfs_open_devices(struct btrfs_fs_devices *fs_devices,
 int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder,
                          struct btrfs_fs_devices **fs_devices_ret);
 int btrfs_close_devices(struct btrfs_fs_devices *fs_devices);
-void btrfs_close_extra_devices(struct btrfs_fs_devices *fs_devices, int step);
+void btrfs_free_extra_devids(struct btrfs_fs_devices *fs_devices, int step);
 void btrfs_assign_next_active_device(struct btrfs_fs_info *fs_info,
                struct btrfs_device *device, struct btrfs_device *this_dev);
 int btrfs_find_device_missing_or_by_path(struct btrfs_fs_info *fs_info,