From: Omar Sandoval <osandov@osandov.com>
To: linux-btrfs@vger.kernel.org
Cc: kernel-team@fb.com, Christoph Hellwig <hch@lst.de>
Subject: [PATCH 08/15] btrfs: move btrfs_dio_private to inode.c
Date: Mon, 9 Mar 2020 14:32:34 -0700 [thread overview]
Message-ID: <7cb31cf9673d1d232e770145924ef779d3681058.1583789410.git.osandov@fb.com> (raw)
In-Reply-To: <cover.1583789410.git.osandov@fb.com>
From: Omar Sandoval <osandov@fb.com>
This hasn't been needed outside of inode.c since commit 23ea8e5a0767
("Btrfs: load checksum data once when submitting a direct read io").
Signed-off-by: Omar Sandoval <osandov@fb.com>
---
fs/btrfs/btrfs_inode.h | 30 ------------------------------
fs/btrfs/inode.c | 30 ++++++++++++++++++++++++++++++
2 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h
index 27a1fefce508..ade5c6adec06 100644
--- a/fs/btrfs/btrfs_inode.h
+++ b/fs/btrfs/btrfs_inode.h
@@ -293,36 +293,6 @@ static inline int btrfs_inode_in_log(struct btrfs_inode *inode, u64 generation)
return ret;
}
-#define BTRFS_DIO_ORIG_BIO_SUBMITTED 0x1
-
-struct btrfs_dio_private {
- struct inode *inode;
- unsigned long flags;
- u64 logical_offset;
- u64 disk_bytenr;
- u64 bytes;
- void *private;
-
- /* number of bios pending for this dio */
- atomic_t pending_bios;
-
- /* IO errors */
- int errors;
-
- /* orig_bio is our btrfs_io_bio */
- struct bio *orig_bio;
-
- /* dio_bio came from fs/direct-io.c */
- struct bio *dio_bio;
-
- /*
- * The original bio may be split to several sub-bios, this is
- * done during endio of sub-bios
- */
- blk_status_t (*subio_endio)(struct inode *, struct btrfs_io_bio *,
- blk_status_t);
-};
-
/*
* Disable DIO read nolock optimization, so new dio readers will be forced
* to grab i_mutex. It is used to avoid the endless truncate due to
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 50476ae96552..9d3a275ef253 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -54,6 +54,36 @@ struct btrfs_iget_args {
struct btrfs_root *root;
};
+#define BTRFS_DIO_ORIG_BIO_SUBMITTED 0x1
+
+struct btrfs_dio_private {
+ struct inode *inode;
+ unsigned long flags;
+ u64 logical_offset;
+ u64 disk_bytenr;
+ u64 bytes;
+ void *private;
+
+ /* number of bios pending for this dio */
+ atomic_t pending_bios;
+
+ /* IO errors */
+ int errors;
+
+ /* orig_bio is our btrfs_io_bio */
+ struct bio *orig_bio;
+
+ /* dio_bio came from fs/direct-io.c */
+ struct bio *dio_bio;
+
+ /*
+ * The original bio may be split to several sub-bios, this is
+ * done during endio of sub-bios
+ */
+ blk_status_t (*subio_endio)(struct inode *, struct btrfs_io_bio *,
+ blk_status_t);
+};
+
struct btrfs_dio_data {
u64 reserve;
u64 unsubmitted_oe_range_start;
--
2.25.1
next prev parent reply other threads:[~2020-03-09 21:33 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-09 21:32 [PATCH 00/15] btrfs: read repair/direct I/O improvements Omar Sandoval
2020-03-09 21:32 ` [PATCH 01/15] btrfs: fix error handling when submitting direct I/O bio Omar Sandoval
2020-03-11 17:54 ` Josef Bacik
2020-03-17 13:46 ` Nikolay Borisov
2020-03-09 21:32 ` [PATCH 02/15] btrfs: fix double __endio_write_update_ordered in direct I/O Omar Sandoval
2020-03-10 16:30 ` Christoph Hellwig
2020-03-11 9:03 ` Omar Sandoval
2020-03-17 14:04 ` Nikolay Borisov
2020-03-09 21:32 ` [PATCH 03/15] btrfs: look at full bi_io_vec for repair decision Omar Sandoval
2020-03-10 16:33 ` Christoph Hellwig
2020-03-11 9:07 ` Omar Sandoval
2020-03-16 10:48 ` Christoph Hellwig
2020-03-17 14:38 ` Nikolay Borisov
2020-03-09 21:32 ` [PATCH 04/15] btrfs: don't do repair validation for checksum errors Omar Sandoval
2020-03-11 17:55 ` Josef Bacik
2020-03-09 21:32 ` [PATCH 05/15] btrfs: clarify btrfs_lookup_bio_sums documentation Omar Sandoval
2020-03-11 17:56 ` Josef Bacik
2020-03-11 18:23 ` Omar Sandoval
2020-03-11 18:34 ` Josef Bacik
2020-03-17 14:38 ` Nikolay Borisov
2020-03-09 21:32 ` [PATCH 06/15] btrfs: rename __readpage_endio_check to check_data_csum Omar Sandoval
2020-03-10 14:46 ` Johannes Thumshirn
2020-03-11 17:57 ` Josef Bacik
2020-03-17 14:39 ` Nikolay Borisov
2020-03-09 21:32 ` [PATCH 07/15] btrfs: make btrfs_check_repairable() static Omar Sandoval
2020-03-10 14:53 ` Johannes Thumshirn
2020-03-11 17:58 ` Josef Bacik
2020-03-17 14:52 ` Nikolay Borisov
2020-03-09 21:32 ` Omar Sandoval [this message]
2020-03-10 14:56 ` [PATCH 08/15] btrfs: move btrfs_dio_private to inode.c Johannes Thumshirn
2020-03-11 8:48 ` Omar Sandoval
2020-03-17 14:53 ` Nikolay Borisov
2020-03-19 16:16 ` David Sterba
2020-03-09 21:32 ` [PATCH 09/15] btrfs: kill btrfs_dio_private->private Omar Sandoval
2020-03-11 17:59 ` Josef Bacik
2020-03-17 14:54 ` Nikolay Borisov
2020-03-09 21:32 ` [PATCH 10/15] btrfs: convert btrfs_dio_private->pending_bios to refcount_t Omar Sandoval
2020-03-11 18:00 ` Josef Bacik
2020-03-17 15:10 ` Nikolay Borisov
2020-03-09 21:32 ` [PATCH 11/15] btrfs: put direct I/O checksums in btrfs_dio_private instead of bio Omar Sandoval
2020-03-11 18:04 ` Josef Bacik
2020-03-17 16:37 ` Nikolay Borisov
2020-04-03 16:18 ` David Sterba
2020-03-09 21:32 ` [PATCH 12/15] btrfs: get rid of one layer of bios in direct I/O Omar Sandoval
2020-03-10 16:38 ` Christoph Hellwig
2020-03-11 9:19 ` Omar Sandoval
2020-03-16 10:49 ` Christoph Hellwig
2020-03-11 18:07 ` Josef Bacik
2020-03-17 16:48 ` Nikolay Borisov
2020-03-09 21:32 ` [PATCH 13/15] btrfs: simplify direct I/O read repair Omar Sandoval
2020-03-11 18:16 ` Josef Bacik
2020-04-03 16:40 ` David Sterba
2020-04-03 18:05 ` Omar Sandoval
2020-04-16 10:08 ` David Sterba
2020-03-09 21:32 ` [PATCH 14/15] btrfs: get rid of endio_repair_workers Omar Sandoval
2020-03-11 18:16 ` Josef Bacik
2020-03-09 21:32 ` [PATCH 15/15] btrfs: unify buffered and direct I/O read repair Omar Sandoval
2020-03-11 18:19 ` Josef Bacik
2020-03-19 8:53 ` Nikolay Borisov
2020-03-19 9:03 ` Christoph Hellwig
2020-03-20 21:28 ` Omar Sandoval
2020-03-10 16:39 ` [PATCH 00/15] btrfs: read repair/direct I/O improvements Christoph Hellwig
2020-03-11 9:22 ` Omar Sandoval
2020-03-18 16:33 ` Goldwyn Rodrigues
2020-03-19 14:08 ` David Sterba
2020-03-18 22:07 ` David Sterba
2020-03-20 21:29 ` Omar Sandoval
2020-03-20 14:10 ` Christoph Hellwig
2020-03-20 14:11 ` Christoph Hellwig
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=7cb31cf9673d1d232e770145924ef779d3681058.1583789410.git.osandov@fb.com \
--to=osandov@osandov.com \
--cc=hch@lst.de \
--cc=kernel-team@fb.com \
--cc=linux-btrfs@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).