From: Christoph Hellwig <hch@lst.de>
To: Matthew Wilcox <willy@infradead.org>
Cc: Jens Axboe <axboe@kernel.dk>, Xiubo Li <xiubli@redhat.com>,
Ilya Dryomov <idryomov@gmail.com>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Christian Brauner <brauner@kernel.org>,
"Theodore Ts'o" <tytso@mit.edu>, Jaegeuk Kim <jaegeuk@kernel.org>,
Chao Yu <chao@kernel.org>, Miklos Szeredi <miklos@szeredi.hu>,
Andreas Gruenbacher <agruenba@redhat.com>,
"Darrick J. Wong" <djwong@kernel.org>,
Trond Myklebust <trond.myklebust@hammerspace.com>,
Anna Schumaker <anna@kernel.org>,
Damien Le Moal <dlemoal@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
linux-block@vger.kernel.org, ceph-devel@vger.kernel.org,
linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org,
linux-f2fs-devel@lists.sourceforge.net, cluster-devel@redhat.com,
linux-xfs@vger.kernel.org, linux-nfs@vger.kernel.org,
linux-mm@kvack.org
Subject: [PATCH 12/12] fuse: use direct_write_fallback
Date: Wed, 31 May 2023 09:50:26 +0200 [thread overview]
Message-ID: <20230531075026.480237-13-hch@lst.de> (raw)
In-Reply-To: <20230531075026.480237-1-hch@lst.de>
Use the generic direct_write_fallback helper instead of duplicating the
logic.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
---
fs/fuse/file.c | 24 ++----------------------
1 file changed, 2 insertions(+), 22 deletions(-)
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 025973ad813e05..7a72dc0a691201 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -1340,7 +1340,6 @@ static ssize_t fuse_cache_write_iter(struct kiocb *iocb, struct iov_iter *from)
struct file *file = iocb->ki_filp;
struct address_space *mapping = file->f_mapping;
ssize_t written = 0;
- ssize_t written_buffered = 0;
struct inode *inode = mapping->host;
ssize_t err;
struct fuse_conn *fc = get_fuse_conn(inode);
@@ -1377,30 +1376,11 @@ static ssize_t fuse_cache_write_iter(struct kiocb *iocb, struct iov_iter *from)
goto out;
if (iocb->ki_flags & IOCB_DIRECT) {
- loff_t pos, endbyte;
-
written = generic_file_direct_write(iocb, from);
if (written < 0 || !iov_iter_count(from))
goto out;
-
- written_buffered = fuse_perform_write(iocb, from);
- if (written_buffered < 0) {
- err = written_buffered;
- goto out;
- }
- pos = iocb->ki_pos - written_buffered;
- endbyte = iocb->ki_pos - 1;
-
- err = filemap_write_and_wait_range(file->f_mapping, pos,
- endbyte);
- if (err)
- goto out;
-
- invalidate_mapping_pages(file->f_mapping,
- pos >> PAGE_SHIFT,
- endbyte >> PAGE_SHIFT);
-
- written += written_buffered;
+ written = direct_write_fallback(iocb, from, written,
+ generic_perform_write(iocb, from));
} else {
written = fuse_perform_write(iocb, from);
}
--
2.39.2
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de>
To: Matthew Wilcox <willy@infradead.org>
Cc: "Darrick J. Wong" <djwong@kernel.org>,
linux-mm@kvack.org, Andreas Gruenbacher <agruenba@redhat.com>,
Miklos Szeredi <miklos@szeredi.hu>,
cluster-devel@redhat.com, Ilya Dryomov <idryomov@gmail.com>,
linux-ext4@vger.kernel.org, linux-nfs@vger.kernel.org,
linux-block@vger.kernel.org, Damien Le Moal <dlemoal@kernel.org>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Jaegeuk Kim <jaegeuk@kernel.org>,
ceph-devel@vger.kernel.org, Xiubo Li <xiubli@redhat.com>,
Trond Myklebust <trond.myklebust@hammerspace.com>,
Jens Axboe <axboe@kernel.dk>,
Christian Brauner <brauner@kernel.org>,
Theodore Ts'o <tytso@mit.edu>,
linux-f2fs-devel@lists.sourceforge.net,
linux-xfs@vger.kernel.org, Anna Schumaker <anna@kernel.org>,
linux-fsdevel@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>
Subject: [f2fs-dev] [PATCH 12/12] fuse: use direct_write_fallback
Date: Wed, 31 May 2023 09:50:26 +0200 [thread overview]
Message-ID: <20230531075026.480237-13-hch@lst.de> (raw)
In-Reply-To: <20230531075026.480237-1-hch@lst.de>
Use the generic direct_write_fallback helper instead of duplicating the
logic.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
---
fs/fuse/file.c | 24 ++----------------------
1 file changed, 2 insertions(+), 22 deletions(-)
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 025973ad813e05..7a72dc0a691201 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -1340,7 +1340,6 @@ static ssize_t fuse_cache_write_iter(struct kiocb *iocb, struct iov_iter *from)
struct file *file = iocb->ki_filp;
struct address_space *mapping = file->f_mapping;
ssize_t written = 0;
- ssize_t written_buffered = 0;
struct inode *inode = mapping->host;
ssize_t err;
struct fuse_conn *fc = get_fuse_conn(inode);
@@ -1377,30 +1376,11 @@ static ssize_t fuse_cache_write_iter(struct kiocb *iocb, struct iov_iter *from)
goto out;
if (iocb->ki_flags & IOCB_DIRECT) {
- loff_t pos, endbyte;
-
written = generic_file_direct_write(iocb, from);
if (written < 0 || !iov_iter_count(from))
goto out;
-
- written_buffered = fuse_perform_write(iocb, from);
- if (written_buffered < 0) {
- err = written_buffered;
- goto out;
- }
- pos = iocb->ki_pos - written_buffered;
- endbyte = iocb->ki_pos - 1;
-
- err = filemap_write_and_wait_range(file->f_mapping, pos,
- endbyte);
- if (err)
- goto out;
-
- invalidate_mapping_pages(file->f_mapping,
- pos >> PAGE_SHIFT,
- endbyte >> PAGE_SHIFT);
-
- written += written_buffered;
+ written = direct_write_fallback(iocb, from, written,
+ generic_perform_write(iocb, from));
} else {
written = fuse_perform_write(iocb, from);
}
--
2.39.2
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] [PATCH 12/12] fuse: use direct_write_fallback
Date: Wed, 31 May 2023 09:50:26 +0200 [thread overview]
Message-ID: <20230531075026.480237-13-hch@lst.de> (raw)
In-Reply-To: <20230531075026.480237-1-hch@lst.de>
Use the generic direct_write_fallback helper instead of duplicating the
logic.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
---
fs/fuse/file.c | 24 ++----------------------
1 file changed, 2 insertions(+), 22 deletions(-)
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 025973ad813e05..7a72dc0a691201 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -1340,7 +1340,6 @@ static ssize_t fuse_cache_write_iter(struct kiocb *iocb, struct iov_iter *from)
struct file *file = iocb->ki_filp;
struct address_space *mapping = file->f_mapping;
ssize_t written = 0;
- ssize_t written_buffered = 0;
struct inode *inode = mapping->host;
ssize_t err;
struct fuse_conn *fc = get_fuse_conn(inode);
@@ -1377,30 +1376,11 @@ static ssize_t fuse_cache_write_iter(struct kiocb *iocb, struct iov_iter *from)
goto out;
if (iocb->ki_flags & IOCB_DIRECT) {
- loff_t pos, endbyte;
-
written = generic_file_direct_write(iocb, from);
if (written < 0 || !iov_iter_count(from))
goto out;
-
- written_buffered = fuse_perform_write(iocb, from);
- if (written_buffered < 0) {
- err = written_buffered;
- goto out;
- }
- pos = iocb->ki_pos - written_buffered;
- endbyte = iocb->ki_pos - 1;
-
- err = filemap_write_and_wait_range(file->f_mapping, pos,
- endbyte);
- if (err)
- goto out;
-
- invalidate_mapping_pages(file->f_mapping,
- pos >> PAGE_SHIFT,
- endbyte >> PAGE_SHIFT);
-
- written += written_buffered;
+ written = direct_write_fallback(iocb, from, written,
+ generic_perform_write(iocb, from));
} else {
written = fuse_perform_write(iocb, from);
}
--
2.39.2
next prev parent reply other threads:[~2023-05-31 7:52 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-31 7:50 cleanup the filemap / direct I/O interaction v3 (full series now) Christoph Hellwig
2023-05-31 7:50 ` [Cluster-devel] " Christoph Hellwig
2023-05-31 7:50 ` [f2fs-dev] " Christoph Hellwig
2023-05-31 7:50 ` [PATCH 01/12] backing_dev: remove current->backing_dev_info Christoph Hellwig
2023-05-31 7:50 ` [Cluster-devel] " Christoph Hellwig
2023-05-31 7:50 ` [f2fs-dev] " Christoph Hellwig
2023-05-31 9:04 ` Damien Le Moal
2023-05-31 9:04 ` [Cluster-devel] " Damien Le Moal
2023-05-31 9:04 ` [f2fs-dev] " Damien Le Moal
2023-05-31 11:38 ` Johannes Thumshirn
2023-05-31 11:38 ` [Cluster-devel] " Johannes Thumshirn
2023-05-31 11:38 ` [f2fs-dev] " Johannes Thumshirn via Linux-f2fs-devel
2023-05-31 14:11 ` Christian Brauner
2023-05-31 14:11 ` [Cluster-devel] " Christian Brauner
2023-05-31 14:11 ` [f2fs-dev] " Christian Brauner
2023-06-01 4:04 ` Theodore Ts'o
2023-06-01 4:04 ` [Cluster-devel] " Theodore Ts'o
2023-06-01 4:04 ` [f2fs-dev] " Theodore Ts'o
2023-05-31 7:50 ` [PATCH 02/12] iomap: update ki_pos a little later in iomap_dio_complete Christoph Hellwig
2023-05-31 7:50 ` [Cluster-devel] " Christoph Hellwig
2023-05-31 7:50 ` [f2fs-dev] " Christoph Hellwig
2023-05-31 7:50 ` [PATCH 03/12] filemap: update ki_pos in generic_perform_write Christoph Hellwig
2023-05-31 7:50 ` [Cluster-devel] " Christoph Hellwig
2023-05-31 7:50 ` [f2fs-dev] " Christoph Hellwig
2023-06-01 4:06 ` Theodore Ts'o
2023-06-01 4:06 ` [Cluster-devel] " Theodore Ts'o
2023-06-01 4:06 ` [f2fs-dev] " Theodore Ts'o
2023-05-31 7:50 ` [PATCH 04/12] filemap: add a kiocb_write_and_wait helper Christoph Hellwig
2023-05-31 7:50 ` [Cluster-devel] " Christoph Hellwig
2023-05-31 7:50 ` [f2fs-dev] " Christoph Hellwig
2023-05-31 7:50 ` [PATCH 05/12] filemap: add a kiocb_invalidate_pages helper Christoph Hellwig
2023-05-31 7:50 ` [Cluster-devel] " Christoph Hellwig
2023-05-31 7:50 ` [f2fs-dev] " Christoph Hellwig
2023-05-31 7:50 ` [PATCH 06/12] filemap: add a kiocb_invalidate_post_direct_write helper Christoph Hellwig
2023-05-31 7:50 ` [Cluster-devel] " Christoph Hellwig
2023-05-31 7:50 ` [f2fs-dev] " Christoph Hellwig
2023-05-31 7:50 ` [PATCH 07/12] iomap: update ki_pos in iomap_file_buffered_write Christoph Hellwig
2023-05-31 7:50 ` [Cluster-devel] " Christoph Hellwig
2023-05-31 7:50 ` [f2fs-dev] " Christoph Hellwig
2023-05-31 7:50 ` [PATCH 08/12] iomap: use kiocb_write_and_wait and kiocb_invalidate_pages Christoph Hellwig
2023-05-31 7:50 ` [Cluster-devel] " Christoph Hellwig
2023-05-31 7:50 ` [f2fs-dev] " Christoph Hellwig
2023-05-31 7:50 ` [PATCH 09/12] fs: factor out a direct_write_fallback helper Christoph Hellwig
2023-05-31 7:50 ` [Cluster-devel] " Christoph Hellwig
2023-05-31 7:50 ` [f2fs-dev] " Christoph Hellwig
2023-05-31 9:08 ` Damien Le Moal
2023-05-31 9:08 ` [Cluster-devel] " Damien Le Moal
2023-05-31 9:08 ` [f2fs-dev] " Damien Le Moal
2023-05-31 9:15 ` Miklos Szeredi
2023-05-31 9:15 ` [Cluster-devel] " Miklos Szeredi
2023-05-31 9:15 ` [f2fs-dev] " Miklos Szeredi via Linux-f2fs-devel
2023-05-31 7:50 ` [PATCH 10/12] fuse: update ki_pos in fuse_perform_write Christoph Hellwig
2023-05-31 7:50 ` [Cluster-devel] " Christoph Hellwig
2023-05-31 7:50 ` [f2fs-dev] " Christoph Hellwig
2023-05-31 9:11 ` Miklos Szeredi
2023-05-31 9:11 ` [Cluster-devel] " Miklos Szeredi
2023-05-31 9:11 ` [f2fs-dev] " Miklos Szeredi via Linux-f2fs-devel
2023-06-01 6:34 ` Christoph Hellwig
2023-06-01 6:34 ` [Cluster-devel] " Christoph Hellwig
2023-06-01 6:34 ` [f2fs-dev] " Christoph Hellwig
2023-05-31 7:50 ` [PATCH 11/12] fuse: drop redundant arguments to fuse_perform_write Christoph Hellwig
2023-05-31 7:50 ` [Cluster-devel] " Christoph Hellwig
2023-05-31 7:50 ` [f2fs-dev] " Christoph Hellwig
2023-05-31 7:50 ` Christoph Hellwig [this message]
2023-05-31 7:50 ` [Cluster-devel] [PATCH 12/12] fuse: use direct_write_fallback Christoph Hellwig
2023-05-31 7:50 ` [f2fs-dev] " Christoph Hellwig
2023-05-31 9:01 ` Miklos Szeredi
2023-05-31 9:01 ` [Cluster-devel] " Miklos Szeredi
2023-05-31 9:01 ` [f2fs-dev] " Miklos Szeredi via Linux-f2fs-devel
2023-06-01 14:58 cleanup the filemap / direct I/O interaction v4 Christoph Hellwig
2023-06-01 14:59 ` [PATCH 12/12] fuse: use direct_write_fallback 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=20230531075026.480237-13-hch@lst.de \
--to=hch@lst.de \
--cc=agruenba@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=anna@kernel.org \
--cc=axboe@kernel.dk \
--cc=brauner@kernel.org \
--cc=ceph-devel@vger.kernel.org \
--cc=chao@kernel.org \
--cc=cluster-devel@redhat.com \
--cc=djwong@kernel.org \
--cc=dlemoal@kernel.org \
--cc=idryomov@gmail.com \
--cc=jaegeuk@kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-nfs@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=miklos@szeredi.hu \
--cc=trond.myklebust@hammerspace.com \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
--cc=willy@infradead.org \
--cc=xiubli@redhat.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.