btrfs: rename local devices for fs_devices in btrfs_free_stale_devices(

[ Upstream commit fa6d2ae540a200a17bb7ee769f9df22d411c9404 ]

Over the years we named %fs_devices and %devices to represent the
struct btrfs_fs_devices and the struct btrfs_device. So follow the same
scheme here too. No functional changes.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index b53e5b63f11633f32a6211588ca7207a5e404d2f..34ac2c7c8b9725dc65a73ec8b326037ed8079162 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -634,43 +634,42 @@ static void pending_bios_fn(struct btrfs_work *work)
  *             devices.
  */
 static void btrfs_free_stale_devices(const char *path,
-                                    struct btrfs_device *skip_dev)
+                                    struct btrfs_device *skip_device)
 {
-       struct btrfs_fs_devices *fs_devs, *tmp_fs_devs;
-       struct btrfs_device *dev, *tmp_dev;
+       struct btrfs_fs_devices *fs_devices, *tmp_fs_devices;
+       struct btrfs_device *device, *tmp_device;
 
-       list_for_each_entry_safe(fs_devs, tmp_fs_devs, &fs_uuids, fs_list) {
-
-               if (fs_devs->opened)
+       list_for_each_entry_safe(fs_devices, tmp_fs_devices, &fs_uuids, fs_list) {
+               if (fs_devices->opened)
                        continue;
 
-               list_for_each_entry_safe(dev, tmp_dev,
-                                        &fs_devs->devices, dev_list) {
+               list_for_each_entry_safe(device, tmp_device,
+                                        &fs_devices->devices, dev_list) {
                        int not_found = 0;
 
-                       if (skip_dev && skip_dev == dev)
+                       if (skip_device && skip_device == device)
                                continue;
-                       if (path && !dev->name)
+                       if (path && !device->name)
                                continue;
 
                        rcu_read_lock();
                        if (path)
-                               not_found = strcmp(rcu_str_deref(dev->name),
+                               not_found = strcmp(rcu_str_deref(device->name),
                                                   path);
                        rcu_read_unlock();
                        if (not_found)
                                continue;
 
                        /* delete the stale device */
-                       if (fs_devs->num_devices == 1) {
-                               btrfs_sysfs_remove_fsid(fs_devs);
-                               list_del(&fs_devs->fs_list);
-                               free_fs_devices(fs_devs);
+                       if (fs_devices->num_devices == 1) {
+                               btrfs_sysfs_remove_fsid(fs_devices);
+                               list_del(&fs_devices->fs_list);
+                               free_fs_devices(fs_devices);
                                break;
                        } else {
-                               fs_devs->num_devices--;
-                               list_del(&dev->dev_list);
-                               btrfs_free_device(dev);
+                               fs_devices->num_devices--;
+                               list_del(&device->dev_list);
+                               btrfs_free_device(device);
                        }
                }
        }