btrfs: get fs_info from device in btrfs_scrub_cancel_dev

We can read fs_info from the device and can drop it from the parameters.

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

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 69a60d2217e555d6486b063067381fa5146501a6..05731e4ca358608938f0ea89b5e45727e1915ed7 100644 (file)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -3752,8 +3752,7 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start,
 void btrfs_scrub_pause(struct btrfs_fs_info *fs_info);
 void btrfs_scrub_continue(struct btrfs_fs_info *fs_info);
 int btrfs_scrub_cancel(struct btrfs_fs_info *info);
-int btrfs_scrub_cancel_dev(struct btrfs_fs_info *info,
-                          struct btrfs_device *dev);
+int btrfs_scrub_cancel_dev(struct btrfs_device *dev);
 int btrfs_scrub_progress(struct btrfs_fs_info *fs_info, u64 devid,
                         struct btrfs_scrub_progress *progress);
 static inline void btrfs_init_full_stripe_locks_tree(

diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index ed471ffbf115a3c2bc294d6a74c6d7a32ce8672f..f7b29f9db5e2ffa090b9468b012f070f7ab1cbf5 100644 (file)
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
@@ -3999,9 +3999,9 @@ int btrfs_scrub_cancel(struct btrfs_fs_info *fs_info)
        return 0;
 }
 
-int btrfs_scrub_cancel_dev(struct btrfs_fs_info *fs_info,
-                          struct btrfs_device *dev)
+int btrfs_scrub_cancel_dev(struct btrfs_device *dev)
 {
+       struct btrfs_fs_info *fs_info = dev->fs_info;
        struct scrub_ctx *sctx;
 
        mutex_lock(&fs_info->scrub_lock);

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index dcbfd027fdf6e32b530e94c88036c812d17d303a..c5bdd38179b6b889a52b65308f70293c794573f9 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -2149,7 +2149,7 @@ int btrfs_rm_device(struct btrfs_fs_info *fs_info, const char *device_path,
                goto error_undo;
 
        clear_bit(BTRFS_DEV_STATE_IN_FS_METADATA, &device->dev_state);
-       btrfs_scrub_cancel_dev(fs_info, device);
+       btrfs_scrub_cancel_dev(device);
 
        /*
         * the device list mutex makes sure that we don't change