Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

[firefly-linux-kernel-4.4.55.git] / fs / nfs / file.c

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index c43a452f7da2e70c084bddb7dfe6415d194bdf3e..4fdaaa63cf1c3f0d72ca58088ba312026881aa19 100644 (file)
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -530,6 +530,8 @@ static int nfs_vm_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
        if (mapping != dentry->d_inode->i_mapping)
                goto out_unlock;
 
+       wait_on_page_writeback(page);
+
        pagelen = nfs_page_length(page);
        if (pagelen == 0)
                goto out_unlock;