Thread (33 messages) 33 messages, 4 authors, 2021-11-29
STALE1677d

[PATCH 17/21] btrfs: move btrfs_scrub_pause() definition to scrub.h

From: Johannes Thumshirn <hidden>
Date: 2021-11-24 09:31:25
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_pause()'s definition there.

Signed-off-by: Johannes Thumshirn <redacted>
---
 fs/btrfs/ctree.h       | 1 -
 fs/btrfs/scrub.h       | 1 +
 fs/btrfs/transaction.c | 1 +
 fs/btrfs/volumes.c     | 1 +
 4 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index c050c47131760..5ab09bb0279fe 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 */
-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_device *dev);
diff --git a/fs/btrfs/scrub.h b/fs/btrfs/scrub.h
index 9ff9d3e033b25..f06e4a10a08b9 100644
--- a/fs/btrfs/scrub.h
+++ b/fs/btrfs/scrub.h
@@ -53,4 +53,5 @@ void btrfs_scrub_wr_submit(struct scrub_ctx *sctx);
 int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start,
 		    u64 end, struct btrfs_scrub_progress *progress,
 		    int readonly, int is_dev_replace);
+void btrfs_scrub_pause(struct btrfs_fs_info *fs_info);
 #endif /* BTRFS_SCRUB_H */
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 8b6a90fafcd41..df56c6991294d 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -22,6 +22,7 @@
 #include "block-group.h"
 #include "space-info.h"
 #include "zoned.h"
+#include "scrub.h"
 
 #define BTRFS_ROOT_TRANS_TAG 0
 
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 23459328d19bc..3c31f8fd4bb3c 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -33,6 +33,7 @@
 #include "block-group.h"
 #include "discard.h"
 #include "zoned.h"
+#include "scrub.h"
 
 const struct btrfs_raid_attr btrfs_raid_array[BTRFS_NR_RAID_TYPES] = {
 	[BTRFS_RAID_RAID10] = {
-- 
2.31.1
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help