From: Andreas Gruenbacher <agruenba@redhat.com>
To: Linus Torvalds <torvalds@linux-foundation.org>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Christoph Hellwig <hch@infradead.org>,
"Darrick J. Wong" <djwong@kernel.org>
Cc: Jan Kara <jack@suse.cz>,
Andreas Gruenbacher <agruenba@redhat.com>,
linux-kernel@vger.kernel.org, cluster-devel@redhat.com,
linux-fsdevel@vger.kernel.org, ocfs2-devel@oss.oracle.com
Subject: [Ocfs2-devel] [PATCH v3 4/7] iomap: Fix iomap_dio_rw return value for user copies
Date: Fri, 23 Jul 2021 22:58:37 +0200 [thread overview]
Message-ID: <20210723205840.299280-5-agruenba@redhat.com> (raw)
In-Reply-To: <20210723205840.299280-1-agruenba@redhat.com>
When a user copy fails in one of the helpers of iomap_dio_rw, fail with -EFAULT
instead of returning 0. This matches what iomap_dio_bio_actor already returns
when it gets an -EFAULT from bio_iov_iter_get_pages.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
---
fs/iomap/direct-io.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c
index 9398b8c31323..cc0b4bc8861b 100644
--- a/fs/iomap/direct-io.c
+++ b/fs/iomap/direct-io.c
@@ -370,7 +370,7 @@ iomap_dio_hole_actor(loff_t length, struct iomap_dio *dio)
{
length = iov_iter_zero(length, dio->submit.iter);
dio->size += length;
- return length;
+ return length ?: -EFAULT;
}
static loff_t
@@ -397,7 +397,7 @@ iomap_dio_inline_actor(struct inode *inode, loff_t pos, loff_t length,
copied = copy_to_iter(iomap->inline_data + pos, length, iter);
}
dio->size += copied;
- return copied;
+ return copied ?: -EFAULT;
}
static loff_t
--
2.26.3
_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel@oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel
next prev parent reply other threads:[~2021-07-23 20:59 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-23 20:58 [Ocfs2-devel] [PATCH v3 0/7] gfs2: Fix mmap + page fault deadlocks Andreas Gruenbacher
2021-07-23 20:58 ` [Ocfs2-devel] [PATCH v3 1/7] iov_iter: Introduce fault_in_iov_iter helper Andreas Gruenbacher
2021-07-23 23:40 ` Linus Torvalds
2021-07-24 7:51 ` Andreas Grünbacher
2021-07-24 1:52 ` Al Viro
2021-07-24 8:05 ` Andreas Grünbacher
2021-07-26 16:33 ` Jan Kara
2021-07-26 17:15 ` Linus Torvalds
2021-07-23 20:58 ` [Ocfs2-devel] [PATCH v3 2/7] gfs2: Add wrapper for iomap_file_buffered_write Andreas Gruenbacher
2021-07-23 20:58 ` [Ocfs2-devel] [PATCH v3 3/7] gfs2: Fix mmap + page fault deadlocks for buffered I/O Andreas Gruenbacher
2021-07-23 20:58 ` Andreas Gruenbacher [this message]
2021-07-23 20:58 ` [Ocfs2-devel] [PATCH v3 5/7] iomap: Support restarting direct I/O requests after user copy failures Andreas Gruenbacher
2021-07-26 17:19 ` Jan Kara
2021-07-26 17:45 ` Andreas Grünbacher
2021-07-26 18:08 ` Jan Kara
2021-07-23 20:58 ` [Ocfs2-devel] [PATCH v3 6/7] iov_iter: Introduce noio flag to disable page faults Andreas Gruenbacher
2021-07-23 20:58 ` [Ocfs2-devel] [PATCH v3 7/7] gfs2: Fix mmap + page fault deadlocks for direct I/O Andreas Gruenbacher
2021-07-26 17:02 ` Jan Kara
2021-07-26 17:50 ` Andreas Grünbacher
2021-07-26 18:00 ` Jan Kara
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=20210723205840.299280-5-agruenba@redhat.com \
--to=agruenba@redhat.com \
--cc=cluster-devel@redhat.com \
--cc=djwong@kernel.org \
--cc=hch@infradead.org \
--cc=jack@suse.cz \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ocfs2-devel@oss.oracle.com \
--cc=torvalds@linux-foundation.org \
--cc=viro@zeniv.linux.org.uk \
/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).