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 10/21] btrfs: move struct scrub_ctx to scrub.h
Date: Wed, 24 Nov 2021 01:30:36 -0800 [thread overview]
Message-ID: <c120d508b232845c70d4c5378c12b0152d7d700e.1637745470.git.johannes.thumshirn@wdc.com> (raw)
In-Reply-To: <cover.1637745470.git.johannes.thumshirn@wdc.com>
Move 'struct scrub_ctx' to the newly created scrub.h file.
This is a preparation step for moving zoned only code from scrub.c to
zoned.c.
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
---
fs/btrfs/scrub.c | 44 +----------------------------------------
fs/btrfs/scrub.h | 51 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 52 insertions(+), 43 deletions(-)
create mode 100644 fs/btrfs/scrub.h
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index 70cf1f487748c..a2c42ff544701 100644
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
@@ -21,6 +21,7 @@
#include "raid56.h"
#include "block-group.h"
#include "zoned.h"
+#include "scrub.h"
/*
* This is only the first step towards a full-features scrub. It reads all
@@ -46,7 +47,6 @@ struct scrub_ctx;
*/
#define SCRUB_PAGES_PER_RD_BIO 32 /* 128k per bio */
#define SCRUB_PAGES_PER_WR_BIO 32 /* 128k per bio */
-#define SCRUB_BIOS_PER_SCTX 64 /* 8MB per device in flight */
/*
* the following value times PAGE_SIZE needs to be large enough to match the
@@ -151,48 +151,6 @@ struct scrub_parity {
unsigned long bitmap[];
};
-struct scrub_ctx {
- struct scrub_bio *bios[SCRUB_BIOS_PER_SCTX];
- struct btrfs_fs_info *fs_info;
- int first_free;
- int curr;
- atomic_t bios_in_flight;
- atomic_t workers_pending;
- spinlock_t list_lock;
- wait_queue_head_t list_wait;
- struct list_head csum_list;
- atomic_t cancel_req;
- int readonly;
- int pages_per_rd_bio;
-
- /* State of IO submission throttling affecting the associated device */
- ktime_t throttle_deadline;
- u64 throttle_sent;
-
- int is_dev_replace;
- u64 write_pointer;
-
- struct scrub_bio *wr_curr_bio;
- struct mutex wr_lock;
- int pages_per_wr_bio; /* <= SCRUB_PAGES_PER_WR_BIO */
- struct btrfs_device *wr_tgtdev;
- bool flush_all_writes;
-
- /*
- * statistics
- */
- struct btrfs_scrub_progress stat;
- spinlock_t stat_lock;
-
- /*
- * Use a ref counter to avoid use-after-free issues. Scrub workers
- * decrement bios_in_flight and workers_pending and then do a wakeup
- * on the list_wait wait queue. We must ensure the main scrub task
- * doesn't free the scrub context before or while the workers are
- * doing the wakeup() call.
- */
- refcount_t refs;
-};
struct scrub_warning {
struct btrfs_path *path;
diff --git a/fs/btrfs/scrub.h b/fs/btrfs/scrub.h
new file mode 100644
index 0000000000000..3eb8c8905c902
--- /dev/null
+++ b/fs/btrfs/scrub.h
@@ -0,0 +1,51 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
+#ifndef BTRFS_SCRUB_H
+#define BTRFS_SCRUB_H
+
+#define SCRUB_BIOS_PER_SCTX 64 /* 8MB per device in flight */
+
+struct scrub_ctx {
+ struct scrub_bio *bios[SCRUB_BIOS_PER_SCTX];
+ struct btrfs_fs_info *fs_info;
+ int first_free;
+ int curr;
+ atomic_t bios_in_flight;
+ atomic_t workers_pending;
+ spinlock_t list_lock;
+ wait_queue_head_t list_wait;
+ struct list_head csum_list;
+ atomic_t cancel_req;
+ int readonly;
+ int pages_per_rd_bio;
+
+ /* State of IO submission throttling affecting the associated device */
+ ktime_t throttle_deadline;
+ u64 throttle_sent;
+
+ int is_dev_replace;
+ u64 write_pointer;
+
+ struct scrub_bio *wr_curr_bio;
+ struct mutex wr_lock;
+ int pages_per_wr_bio; /* <= SCRUB_PAGES_PER_WR_BIO */
+ struct btrfs_device *wr_tgtdev;
+ bool flush_all_writes;
+
+ /*
+ * statistics
+ */
+ struct btrfs_scrub_progress stat;
+ spinlock_t stat_lock;
+
+ /*
+ * Use a ref counter to avoid use-after-free issues. Scrub workers
+ * decrement bios_in_flight and workers_pending and then do a wakeup
+ * on the list_wait wait queue. We must ensure the main scrub task
+ * doesn't free the scrub context before or while the workers are
+ * doing the wakeup() call.
+ */
+ refcount_t refs;
+};
+
+#endif /* BTRFS_SCRUB_H */
--
2.31.1
next prev 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 ` Johannes Thumshirn [this message]
2021-11-26 16:48 ` [PATCH 10/21] btrfs: move struct scrub_ctx to scrub.h 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 ` [PATCH 16/21] btrfs: move btrfs_scrub_dev() definition to scrub.h Johannes Thumshirn
2021-11-24 9:30 ` [PATCH 17/21] btrfs: move btrfs_scrub_pause() " 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=c120d508b232845c70d4c5378c12b0152d7d700e.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.