Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef070dcb authored Mar 03, 2015 by Trond Myklebust

NFS: Don't write enable new pages while an invalidation is proceeding



nfs_vm_page_mkwrite() should wait until the page cache invalidation
is finished. This is the second patch in a 2 patch series to deprecate
the NFS client's reliance on nfs_release_page() in the context of
nfs_invalidate_mapping().

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

parent 874f9463

fs/nfs/file.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -623,6 +623,9 @@ static int nfs_vm_page_mkwrite(struct vm_area_struct vma, struct vm_fault vmf)
		/* make sure the cache has finished storing the page */
		nfs_fscache_wait_on_page_write(NFS_I(inode), page);

		wait_on_bit_action(&NFS_I(inode)->flags, NFS_INO_INVALIDATING,
		nfs_wait_bit_killable, TASK_KILLABLE);

		lock_page(page);
		mapping = page_file_mapping(page);
		if (mapping != inode->i_mapping)

fs/nfs/inode.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1035,6 +1035,7 @@ static int nfs_invalidate_mapping(struct inode inode, struct address_space map

		if (mapping->nrpages != 0) {
		if (S_ISREG(inode->i_mode)) {
		unmap_mapping_range(mapping, 0, 0, 0);
		ret = nfs_sync_mapping(mapping);
		if (ret < 0)
		return ret;