diff options
| -rw-r--r-- | fs/nfs/file.c | 9 | ||||
| -rw-r--r-- | fs/nfs/write.c | 5 |
2 files changed, 12 insertions, 2 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 325df0aeab05..24832d040eb8 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -477,7 +477,8 @@ static int nfs_release_page(struct page *page, gfp_t gfp) /* Always try to initiate a 'commit' if relevant, but only * wait for it if __GFP_WAIT is set and the calling process is - * allowed to block. Even then, only wait 1 second. + * allowed to block. Even then, only wait 1 second and only + * if the 'bdi' is not congested. * Waiting indefinitely can cause deadlocks when the NFS * server is on this machine, and there is no particular need * to wait extensively here. A short wait has the benefit @@ -488,9 +489,13 @@ static int nfs_release_page(struct page *page, gfp_t gfp) nfs_commit_inode(mapping->host, 0); if ((gfp & __GFP_WAIT) && !current_is_kswapd() && - !(current->flags & PF_FSTRANS)) { + !(current->flags & PF_FSTRANS) && + !bdi_write_congested(&nfss->backing_dev_info)) { wait_on_page_bit_killable_timeout(page, PG_private, HZ); + if (PagePrivate(page)) + set_bdi_congested(&nfss->backing_dev_info, + BLK_RW_ASYNC); } } /* If PagePrivate() is set, then the page is not freeable */ diff --git a/fs/nfs/write.c b/fs/nfs/write.c index c063a4e70354..12493846a2d3 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -1611,6 +1611,7 @@ static void nfs_commit_release_pages(struct nfs_commit_data *data) struct nfs_page *req; int status = data->task.tk_status; struct nfs_commit_info cinfo; + struct nfs_server *nfss; while (!list_empty(&data->pages)) { req = nfs_list_entry(data->pages.next); @@ -1644,6 +1645,10 @@ static void nfs_commit_release_pages(struct nfs_commit_data *data) next: nfs_unlock_and_release_request(req); } + nfss = NFS_SERVER(data->inode); + if (atomic_long_read(&nfss->writeback) < NFS_CONGESTION_OFF_THRESH) + clear_bdi_congested(&nfss->backing_dev_info, BLK_RW_ASYNC); + nfs_init_cinfo(&cinfo, data->inode, data->dreq); if (atomic_dec_and_test(&cinfo.mds->rpcs_out)) nfs_commit_clear_lock(NFS_I(data->inode)); |