All of lore.kernel.org
 help / color / mirror / Atom feed
From: Johannes Thumshirn <johannes.thumshirn@wdc.com>
To: David Sterba <dsterba@suse.com>
Cc: Johannes Thumshirn <johannes.thumshirn@wdc.com>,
	linux-btrfs@vger.kernel.org, Nikolay Borisov <nborisov@suse.com>,
	Naohiro Aota <Naohiro.Aota@wdc.com>
Subject: [PATCH 16/21] btrfs: move btrfs_scrub_dev() definition to scrub.h
Date: Wed, 24 Nov 2021 01:30:42 -0800	[thread overview]
Message-ID: <4344c424f8638151bc1faeae080644a7dd1f488a.1637745470.git.johannes.thumshirn@wdc.com> (raw)
In-Reply-To: <cover.1637745470.git.johannes.thumshirn@wdc.com>

Now that we have a scrub.h move btrfs_scrub_dev()'s definition there.

Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
---
 fs/btrfs/ctree.h       | 3 ---
 fs/btrfs/dev-replace.c | 1 +
 fs/btrfs/ioctl.c       | 1 +
 fs/btrfs/scrub.h       | 3 +++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index f1dd2486dcb37..c050c47131760 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -3801,9 +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_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);
 void btrfs_scrub_continue(struct btrfs_fs_info *fs_info);
 int btrfs_scrub_cancel(struct btrfs_fs_info *info);
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index 1fcc5d57e96ef..bb325334333a7 100644
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -23,6 +23,7 @@
 #include "sysfs.h"
 #include "zoned.h"
 #include "block-group.h"
+#include "scrub.h"
 
 /*
  * Device replace overview
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index d7f710e57890e..cc2e1297ca250 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -50,6 +50,7 @@
 #include "block-group.h"
 #include "subpage.h"
 #include "zoned.h"
+#include "scrub.h"
 
 #ifdef CONFIG_64BIT
 /* If we have a 32-bit userspace and 64-bit kernel, then the UAPI
diff --git a/fs/btrfs/scrub.h b/fs/btrfs/scrub.h
index 8d17fac108556..9ff9d3e033b25 100644
--- a/fs/btrfs/scrub.h
+++ b/fs/btrfs/scrub.h
@@ -50,4 +50,7 @@ struct scrub_ctx {
 
 void btrfs_scrub_submit(struct scrub_ctx *sctx);
 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);
 #endif /* BTRFS_SCRUB_H */
-- 
2.31.1


  parent reply	other threads:[~2021-11-24  9:31 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-24  9:30 [PATCH 00/21] btrfs: first batch of zoned cleanups Johannes Thumshirn
2021-11-24  9:30 ` [PATCH 01/21] btrfs: zoned: encapsulate inode locking for zoned relocation Johannes Thumshirn
2021-11-24  9:30 ` [PATCH 02/21] btrfs: zoned: simplify btrfs_check_meta_write_pointer Johannes Thumshirn
2021-11-24  9:30 ` [PATCH 03/21] btrfs: zoned: sink zone check into btrfs_repair_one_zone Johannes Thumshirn
2021-11-24 16:28   ` Josef Bacik
2021-11-24 17:29   ` David Sterba
2021-11-25  7:13     ` Johannes Thumshirn
2021-11-24  9:30 ` [PATCH 04/21] btrfs: zoned: it's pointless to check for REQ_OP_ZONE_APPEND and btrfs_is_zoned Johannes Thumshirn
2021-11-24 17:33   ` David Sterba
2021-11-24  9:30 ` [PATCH 05/21] btrfs: zoned: move compatible fs flags check to zoned code Johannes Thumshirn
2021-11-24 17:36   ` David Sterba
2021-11-25 10:00     ` Johannes Thumshirn
2021-11-24  9:30 ` [PATCH 06/21] btrfs: zoned: move mark_block_group_to_copy " Johannes Thumshirn
2021-11-24 17:48   ` David Sterba
2021-11-24  9:30 ` [PATCH 07/21] btrfs: zoned: move btrfs_finish_block_group_to_copy " Johannes Thumshirn
2021-11-24  9:30 ` [PATCH 08/21] btrfs: zoned: move is_block_group_to_copy " Johannes Thumshirn
2021-11-24  9:30 ` [PATCH 09/21] btrfs: zoned: skip zoned check if block_group is marked as copy Johannes Thumshirn
2021-11-29  8:18   ` [btrfs] a323b5f59e: xfstests.btrfs.167.fail kernel test robot
2021-11-29  8:18     ` kernel test robot
2021-11-24  9:30 ` [PATCH 10/21] btrfs: move struct scrub_ctx to scrub.h Johannes Thumshirn
2021-11-26 16:48   ` David Sterba
2021-11-24  9:30 ` [PATCH 11/21] btrfs: zoned: move fill_writer_pointer_gap to zoned code Johannes Thumshirn
2021-11-24  9:30 ` [PATCH 12/21] btrfs: zoned: sync_write_pointer_for_zoned " Johannes Thumshirn
2021-11-24  9:30 ` [PATCH 13/21] btrfs: make scrub_submit and scrub_wr_submit non-static Johannes Thumshirn
2021-11-24  9:30 ` [PATCH 14/21] btrfs: zoned: move sync_replace_for_zoned to zoned code Johannes Thumshirn
2021-11-24  9:30 ` [PATCH 15/21] btrfs: zoned: move finish_extent_writes_for_zoned " Johannes Thumshirn
2021-11-24  9:30 ` Johannes Thumshirn [this message]
2021-11-24  9:30 ` [PATCH 17/21] btrfs: move btrfs_scrub_pause() definition to scrub.h Johannes Thumshirn
2021-11-24  9:30 ` [PATCH 18/21] btrfs: move btrfs_scrub_continue() " Johannes Thumshirn
2021-11-24  9:30 ` [PATCH 19/21] btrfs: move btrfs_scrub_cancel() " Johannes Thumshirn
2021-11-24  9:30 ` [PATCH 20/21] btrfs: move btrfs_scrub_cancel_dev() " Johannes Thumshirn
2021-11-24  9:30 ` [PATCH 21/21] btrfs: move btrfs_scrub_progress() " Johannes Thumshirn
2021-11-24 16:34 ` [PATCH 00/21] btrfs: first batch of zoned cleanups Josef Bacik
2021-11-25  9:58   ` Johannes Thumshirn

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4344c424f8638151bc1faeae080644a7dd1f488a.1637745470.git.johannes.thumshirn@wdc.com \
    --to=johannes.thumshirn@wdc.com \
    --cc=Naohiro.Aota@wdc.com \
    --cc=dsterba@suse.com \
    --cc=linux-btrfs@vger.kernel.org \
    --cc=nborisov@suse.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.