[PATCH 19/21] btrfs: move btrfs_scrub_cancel() definition to scrub.h
From: Johannes Thumshirn <hidden>
Date: 2021-11-24 09:31:27
Subsystem:
btrfs file system, filesystems (vfs and infrastructure), the rest · Maintainers:
Chris Mason, David Sterba, Alexander Viro, Christian Brauner, Linus Torvalds
Now that we have a scrub.h move btrfs_scrub_cancel()'s definition there. Signed-off-by: Johannes Thumshirn <redacted> --- fs/btrfs/ctree.h | 1 - fs/btrfs/disk-io.c | 1 + fs/btrfs/scrub.h | 1 + fs/btrfs/super.c | 1 + 4 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 064281a700ff1..7ab88e67e3510 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h@@ -3801,7 +3801,6 @@ struct btrfs_root *find_reloc_root(struct btrfs_fs_info *fs_info, int btrfs_should_ignore_reloc_root(struct btrfs_root *root); /* scrub.c */ -int btrfs_scrub_cancel(struct btrfs_fs_info *info); 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);
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 9d66d48945c6a..19afbd4afc792 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c@@ -43,6 +43,7 @@ #include "space-info.h" #include "zoned.h" #include "subpage.h" +#include "scrub.h" #define BTRFS_SUPER_FLAG_SUPP (BTRFS_HEADER_FLAG_WRITTEN |\ BTRFS_HEADER_FLAG_RELOC |\
diff --git a/fs/btrfs/scrub.h b/fs/btrfs/scrub.h
index 69da2e49732df..c511c310d55ea 100644
--- a/fs/btrfs/scrub.h
+++ b/fs/btrfs/scrub.h@@ -55,4 +55,5 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start, int readonly, int is_dev_replace); 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); #endif /* BTRFS_SCRUB_H */
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index a1c54a2c787c5..aa8c62e594a84 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c@@ -49,6 +49,7 @@ #include "block-group.h" #include "discard.h" #include "qgroup.h" +#include "scrub.h" #define CREATE_TRACE_POINTS #include <trace/events/btrfs.h>
--
2.31.1