From: Trond Myklebust Date: Sat, 9 Sep 2017 20:43:09 +0000 (-0400) Subject: NFS: Count the bytes of skipped subrequests in nfs_lock_and_join_requests() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1bd5d6d08ea7ed0794c8a3908383d6d6fc202cdd;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git NFS: Count the bytes of skipped subrequests in nfs_lock_and_join_requests() If we skip a subrequest due to a zero refcount, we should still count the byte range that it covered so that we accurately reconstruct the original request size. Signed-off-by: Trond Myklebust --- diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 36d34a4c86bd..f68083db63c8 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -504,8 +504,12 @@ try_again: for (subreq = head->wb_this_page; subreq != head; subreq = subreq->wb_this_page) { - if (!kref_get_unless_zero(&subreq->wb_kref)) + if (!kref_get_unless_zero(&subreq->wb_kref)) { + if (subreq->wb_offset == head->wb_offset + total_bytes) + total_bytes += subreq->wb_bytes; continue; + } + while (!nfs_lock_request(subreq)) { /* * Unlock page to allow nfs_page_group_sync_on_bit()