diff options
Diffstat (limited to 'fs/netfs')
| -rw-r--r-- | fs/netfs/direct_write.c | 7 | ||||
| -rw-r--r-- | fs/netfs/read_retry.c | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/fs/netfs/direct_write.c b/fs/netfs/direct_write.c index eded8afaa60b..42ce53cc216e 100644 --- a/fs/netfs/direct_write.c +++ b/fs/netfs/direct_write.c @@ -67,7 +67,7 @@ ssize_t netfs_unbuffered_write_iter_locked(struct kiocb *iocb, struct iov_iter * * allocate a sufficiently large bvec array and may shorten the * request. */ - if (async || user_backed_iter(iter)) { + if (user_backed_iter(iter)) { n = netfs_extract_user_iter(iter, len, &wreq->buffer.iter, 0); if (n < 0) { ret = n; @@ -77,6 +77,11 @@ ssize_t netfs_unbuffered_write_iter_locked(struct kiocb *iocb, struct iov_iter * wreq->direct_bv_count = n; wreq->direct_bv_unpin = iov_iter_extract_will_pin(iter); } else { + /* If this is a kernel-generated async DIO request, + * assume that any resources the iterator points to + * (eg. a bio_vec array) will persist till the end of + * the op. + */ wreq->buffer.iter = *iter; } } diff --git a/fs/netfs/read_retry.c b/fs/netfs/read_retry.c index bf6f26525b0d..2290af0d51ac 100644 --- a/fs/netfs/read_retry.c +++ b/fs/netfs/read_retry.c @@ -129,7 +129,8 @@ static void netfs_retry_read_subrequests(struct netfs_io_request *rreq) /* Renegotiate max_len (rsize) */ stream->sreq_max_len = subreq->len; - if (rreq->netfs_ops->prepare_read(subreq) < 0) { + if (rreq->netfs_ops->prepare_read && + rreq->netfs_ops->prepare_read(subreq) < 0) { trace_netfs_sreq(subreq, netfs_sreq_trace_reprep_failed); __set_bit(NETFS_SREQ_FAILED, &subreq->flags); goto abandon; |