summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2017-12-18 14:39:13 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-02-16 20:22:58 +0100
commit3d03af006438b91dab7c1feb474a5c899554acac (patch)
tree25d01db43380c6cc97bd5f53a4284c30a9ab0ba7
parent3ac2d17a6ed38d3e662e56ad79e0ba1a98247830 (diff)
downloadlinux-stable-3d03af006438b91dab7c1feb474a5c899554acac.tar.gz
linux-stable-3d03af006438b91dab7c1feb474a5c899554acac.tar.bz2
linux-stable-3d03af006438b91dab7c1feb474a5c899554acac.zip
NFS: Add a cond_resched() to nfs_commit_release_pages()
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>
-rw-r--r--fs/nfs/write.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index de325804941d..76da415be39a 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -1836,6 +1836,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)