]> git.hungrycats.org Git - linux/commitdiff
NFS: Add a cond_resched() to nfs_commit_release_pages()
authorTrond Myklebust <trond.myklebust@primarydata.com>
Mon, 18 Dec 2017 19:39:13 +0000 (14:39 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 16 Feb 2018 19:09:42 +0000 (20:09 +0100)
commit 7f1bda447c9bd48b415acedba6b830f61591601f upstream.

The commit list can get very large, and so we need a cond_resched()
in nfs_commit_release_pages() in order to ensure we don't hog the CPU
for excessive periods of time.

Reported-by: Mike Galbraith <efault@gmx.de>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/nfs/write.c

index 7a9b6e347249e0426abf7ec35745feceecab446d..6e81a5b5858ec9a9e34a42fbcbd8a3a25af6017b 100644 (file)
@@ -1746,6 +1746,8 @@ static void nfs_commit_release_pages(struct nfs_commit_data *data)
                set_bit(NFS_CONTEXT_RESEND_WRITES, &req->wb_context->flags);
        next:
                nfs_unlock_and_release_request(req);
+               /* Latency breaker */
+               cond_resched();
        }
        nfss = NFS_SERVER(data->inode);
        if (atomic_long_read(&nfss->writeback) < NFS_CONGESTION_OFF_THRESH)