diff --git a/fs/netfs/read_collect.c b/fs/netfs/read_collect.c index b18c65ba5580..eb4fc1f62000 100644 --- a/fs/netfs/read_collect.c +++ b/fs/netfs/read_collect.c @@ -366,6 +366,7 @@ static void netfs_rreq_assess(struct netfs_io_request *rreq) //netfs_rreq_is_still_valid(rreq); if (test_and_clear_bit(NETFS_RREQ_NEED_RETRY, &rreq->flags)) { + cond_resched(); netfs_retry_reads(rreq); return; } @@ -512,9 +513,15 @@ void netfs_read_subreq_terminated(struct netfs_io_subrequest *subreq, __set_bit(NETFS_SREQ_NEED_RETRY, &subreq->flags); __clear_bit(NETFS_SREQ_NO_PROGRESS, &subreq->flags); set_bit(NETFS_RREQ_NEED_RETRY, &rreq->flags); + printk("async: %d, r: %p, %s\n", was_async, rreq, __func__); + if (!was_async) + cond_resched(); } else if (!__test_and_set_bit(NETFS_SREQ_NO_PROGRESS, &subreq->flags)) { __set_bit(NETFS_SREQ_NEED_RETRY, &subreq->flags); set_bit(NETFS_RREQ_NEED_RETRY, &rreq->flags); + printk("async: %d, r: %p, %s\n", was_async, rreq, __func__); + if (!was_async) + cond_resched(); } else { __set_bit(NETFS_SREQ_FAILED, &subreq->flags); error = -ENODATA;