btrfs: factor out reada loop in __reada_start_machine

This is in preparation for moving fs_devices to proper lists.

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/reada.c b/fs/btrfs/reada.c
index 243a2e4..a6bfe7e 100644 (file)
--- a/fs/btrfs/reada.c
+++ b/fs/btrfs/reada.c
@@ -767,15 +767,13 @@ static void reada_start_machine_worker(struct btrfs_work *work)
        kfree(rmw);
 }
 
-static void __reada_start_machine(struct btrfs_fs_info *fs_info)
+/* Try to start up to 10k READA requests for a group of devices */
+static int reada_start_for_fsdevs(struct btrfs_fs_devices *fs_devices)
 {
-       struct btrfs_device *device;
-       struct btrfs_fs_devices *fs_devices = fs_info->fs_devices;
        u64 enqueued;
        u64 total = 0;
-       int i;
+       struct btrfs_device *device;
 
-again:
        do {
                enqueued = 0;
                mutex_lock(&fs_devices->device_list_mutex);
@@ -787,6 +785,18 @@ again:
                mutex_unlock(&fs_devices->device_list_mutex);
                total += enqueued;
        } while (enqueued && total < 10000);
+
+       return total;
+}
+
+static void __reada_start_machine(struct btrfs_fs_info *fs_info)
+{
+       struct btrfs_fs_devices *fs_devices = fs_info->fs_devices;
+       int i;
+       u64 enqueued = 0;
+
+again:
+       enqueued += reada_start_for_fsdevs(fs_devices);
        if (fs_devices->seed) {
                fs_devices = fs_devices->seed;
                goto again;