Merge tag 'v4.20-rc6' into for-4.21/block

Pull in v4.20-rc6 to resolve the conflict in NVMe, but also to get the
two corruption fixes. We're going to be overhauling the direct dispatch
path, and we need to do that on top of the changes we made for that
in mainline.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

1 files changed, 0 insertions, 9 deletions

diff --git a/fs/iomap.c b/fs/iomap.c
index d094e5688bd3..9a5bf1e8925b 100644
--- a/fs/iomap.c
+++ b/fs/iomap.c
@@ -1884,15 +1884,6 @@ iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,
                                 dio->wait_for_completion = true;
                                 ret = 0;
                         }
-
-                        /*
-                         * Splicing to pipes can fail on a full pipe. We have to
-                         * swallow this to make it look like a short IO
-                         * otherwise the higher splice layers will completely
-                         * mishandle the error and stop moving data.
-                         */
-                        if (ret == -EFAULT)
-                                ret = 0;
                         break;
                 }
                 pos += ret;