Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...

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

diff --git a/fs/nilfs2/file.c b/fs/nilfs2/file.c
index 89dc0886387d59cabd1274eac7f935a29ed5ae0a..08fdb77852acd4f2ca692c5c8eb010e55b00aaf5 100644 (file)
--- a/fs/nilfs2/file.c
+++ b/fs/nilfs2/file.c
@@ -126,7 +126,7 @@ static int nilfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
        nilfs_transaction_commit(inode->i_sb);
 
  mapped:
-       wait_on_page_writeback(page);
+       wait_for_stable_page(page);
  out:
        sb_end_pagefault(inode->i_sb);
        return block_page_mkwrite_return(ret);