From: Goldwyn Rodrigues <rgoldwyn@suse.de>
To: linux-fsdevel@vger.kernel.org
Cc: linux-btrfs@vger.kernel.org, darrick.wong@oracle.com, hch@lst.de,
david@fromorbit.com, riteshh@linux.ibm.com,
Goldwyn Rodrigues <rgoldwyn@suse.com>
Subject: [PATCH 12/15] iomap: use a function pointer for dio submits
Date: Sun, 1 Sep 2019 15:08:33 -0500 [thread overview]
Message-ID: <20190901200836.14959-13-rgoldwyn@suse.de> (raw)
In-Reply-To: <20190901200836.14959-1-rgoldwyn@suse.de>
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
This helps filesystems to perform tasks on the bio while
submitting for I/O. Since btrfs requires the position
we are working on, pass pos to iomap_dio_submit_bio()
Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
---
fs/iomap/direct-io.c | 16 +++++++++++-----
include/linux/iomap.h | 1 +
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c
index 5279029c7a3c..00b8af35cf97 100644
--- a/fs/iomap/direct-io.c
+++ b/fs/iomap/direct-io.c
@@ -59,7 +59,7 @@ int iomap_dio_iopoll(struct kiocb *kiocb, bool spin)
EXPORT_SYMBOL_GPL(iomap_dio_iopoll);
static void iomap_dio_submit_bio(struct iomap_dio *dio, struct iomap *iomap,
- struct bio *bio)
+ struct bio *bio, loff_t pos)
{
atomic_inc(&dio->ref);
@@ -67,7 +67,13 @@ static void iomap_dio_submit_bio(struct iomap_dio *dio, struct iomap *iomap,
bio_set_polled(bio, dio->iocb);
dio->submit.last_queue = bdev_get_queue(iomap->bdev);
- dio->submit.cookie = submit_bio(bio);
+ if (iomap->submit_io) {
+ iomap->submit_io(bio, file_inode(dio->iocb->ki_filp),
+ pos);
+ dio->submit.cookie = BLK_QC_T_NONE;
+ } else {
+ dio->submit.cookie = submit_bio(bio);
+ }
}
static ssize_t iomap_dio_complete(struct iomap_dio *dio)
@@ -195,7 +201,7 @@ iomap_dio_zero(struct iomap_dio *dio, struct iomap *iomap, loff_t pos,
get_page(page);
__bio_add_page(bio, page, len, 0);
bio_set_op_attrs(bio, REQ_OP_WRITE, flags);
- iomap_dio_submit_bio(dio, iomap, bio);
+ iomap_dio_submit_bio(dio, iomap, bio, pos);
}
static loff_t
@@ -301,11 +307,11 @@ iomap_dio_bio_actor(struct inode *inode, loff_t pos, loff_t length,
iov_iter_advance(dio->submit.iter, n);
dio->size += n;
- pos += n;
copied += n;
nr_pages = iov_iter_npages(&iter, BIO_MAX_PAGES);
- iomap_dio_submit_bio(dio, iomap, bio);
+ iomap_dio_submit_bio(dio, iomap, bio, pos);
+ pos += n;
} while (nr_pages);
/*
diff --git a/include/linux/iomap.h b/include/linux/iomap.h
index 9c082d36286a..465d736d74ac 100644
--- a/include/linux/iomap.h
+++ b/include/linux/iomap.h
@@ -80,6 +80,7 @@ struct iomap {
void *inline_data;
void *private; /* filesystem private */
const struct iomap_page_ops *page_ops;
+ dio_submit_t *submit_io;
};
static inline sector_t
--
2.16.4
next prev parent reply other threads:[~2019-09-01 20:09 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-01 20:08 [PATCH v3 0/15] Btrfs iomap Goldwyn Rodrigues
2019-09-01 20:08 ` [PATCH 01/15] iomap: Introduce CONFIG_FS_IOMAP_DEBUG Goldwyn Rodrigues
2019-09-01 20:50 ` Darrick J. Wong
2019-09-02 16:29 ` Christoph Hellwig
2019-09-02 17:09 ` Darrick J. Wong
2019-09-02 17:18 ` Christoph Hellwig
2019-09-03 15:06 ` Darrick J. Wong
2019-09-01 20:08 ` [PATCH 02/15] iomap: Use a IOMAP_COW/srcmap for a read-modify-write I/O Goldwyn Rodrigues
2019-09-02 16:31 ` Christoph Hellwig
2019-09-03 3:18 ` Darrick J. Wong
2019-09-03 14:12 ` Goldwyn Rodrigues
2019-09-03 14:05 ` Goldwyn Rodrigues
2019-09-03 14:56 ` Darrick J. Wong
2019-09-01 20:08 ` [PATCH 03/15] iomap: Read page from srcmap for IOMAP_COW Goldwyn Rodrigues
2019-09-02 16:31 ` Christoph Hellwig
2019-09-02 17:01 ` Darrick J. Wong
2019-09-02 17:13 ` Christoph Hellwig
2019-09-01 20:08 ` [PATCH 04/15] btrfs: Eliminate PagePrivate for btrfs data pages Goldwyn Rodrigues
2019-09-01 20:08 ` [PATCH 05/15] btrfs: Add a simple buffered iomap write Goldwyn Rodrigues
2019-09-01 20:08 ` [PATCH 06/15] btrfs: Add CoW in iomap based writes Goldwyn Rodrigues
2019-09-01 20:08 ` [PATCH 07/15] btrfs: remove buffered write code made unnecessary Goldwyn Rodrigues
2019-09-01 20:08 ` [PATCH 08/15] fs: Export generic_file_buffered_read() Goldwyn Rodrigues
2019-09-01 20:08 ` [PATCH 09/15] btrfs: basic direct read operation Goldwyn Rodrigues
2019-09-01 20:08 ` [PATCH 10/15] btrfs: Carve out btrfs_get_extent_map_write() out of btrfs_get_blocks_write() Goldwyn Rodrigues
2019-09-01 20:08 ` [PATCH 11/15] btrfs: Rename __endio_write_update_ordered() to btrfs_update_ordered_extent() Goldwyn Rodrigues
2019-09-01 20:08 ` Goldwyn Rodrigues [this message]
2019-09-02 16:41 ` [PATCH 12/15] iomap: use a function pointer for dio submits Christoph Hellwig
2019-09-01 20:08 ` [PATCH 13/15] btrfs: Use iomap_dio_rw for performing direct I/O writes Goldwyn Rodrigues
2019-09-01 20:08 ` [PATCH 14/15] btrfs: Remove btrfs_dio_data and __btrfs_direct_write Goldwyn Rodrigues
2019-09-01 20:08 ` [PATCH 15/15] btrfs: update inode size during bio completion Goldwyn Rodrigues
2019-09-02 16:43 ` [PATCH v3 0/15] Btrfs iomap Christoph Hellwig
2019-09-03 3:51 ` Shiyang Ruan
2019-09-03 4:29 ` Darrick J. Wong
2019-09-03 5:00 ` Shiyang Ruan
2019-09-03 6:21 ` Christoph Hellwig
2019-09-03 13:44 ` Goldwyn Rodrigues
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=20190901200836.14959-13-rgoldwyn@suse.de \
--to=rgoldwyn@suse.de \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=hch@lst.de \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=rgoldwyn@suse.com \
--cc=riteshh@linux.ibm.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 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).