btrfs: plumb fs_info into btrfs_work

In order to provide an fsid for trace events, we'll need a btrfs_fs_info
pointer.  The most lightweight way to do that for btrfs_work structures
is to associate it with the __btrfs_workqueue structure.  Each queued
btrfs_work structure has a workqueue associated with it, so that's
a natural fit.  It's a privately defined structures, so we add accessors
to retrieve the fs_info pointer.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index acfe72004646..68c8a09ae7e5 100644
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
@@ -3781,27 +3781,27 @@ static noinline_for_stack int scrub_workers_get(struct btrfs_fs_info *fs_info,
         if (fs_info->scrub_workers_refcnt == 0) {
                 if (is_dev_replace)
                         fs_info->scrub_workers =
-                                btrfs_alloc_workqueue("scrub", flags,
+                                btrfs_alloc_workqueue(fs_info, "scrub", flags,
                                                       1, 4);
                 else
                         fs_info->scrub_workers =
-                                btrfs_alloc_workqueue("scrub", flags,
+                                btrfs_alloc_workqueue(fs_info, "scrub", flags,
                                                       max_active, 4);
                 if (!fs_info->scrub_workers)
                         goto fail_scrub_workers;
 
                 fs_info->scrub_wr_completion_workers =
-                        btrfs_alloc_workqueue("scrubwrc", flags,
+                        btrfs_alloc_workqueue(fs_info, "scrubwrc", flags,
                                               max_active, 2);
                 if (!fs_info->scrub_wr_completion_workers)
                         goto fail_scrub_wr_completion_workers;
 
                 fs_info->scrub_nocow_workers =
-                        btrfs_alloc_workqueue("scrubnc", flags, 1, 0);
+                        btrfs_alloc_workqueue(fs_info, "scrubnc", flags, 1, 0);
                 if (!fs_info->scrub_nocow_workers)
                         goto fail_scrub_nocow_workers;
                 fs_info->scrub_parity_workers =
-                        btrfs_alloc_workqueue("scrubparity", flags,
+                        btrfs_alloc_workqueue(fs_info, "scrubparity", flags,
                                               max_active, 2);
                 if (!fs_info->scrub_parity_workers)
                         goto fail_scrub_parity_workers;