Commit 4c1bbf1b authored Oct 06, 2008 by Tao Ma Committed by Mark Fasheh Nov 10, 2008

ocfs2: return 0 in page_mkwrite to let VFS retry.



In ocfs2_page_mkwrite, we return -EINVAL when we found the page mapping
isn't updated, and it will cause the user space program get SIGBUS and
exit. The reason is that during race writeable mmap, we will do
unmap_mapping_range in ocfs2_data_downconvert_worker. The good thing is
that if we reuturn 0 in page_mkwrite, VFS will retry fault and then
call page_mkwrite again, so it is safe to return 0 here.

Signed-off-by: Tao Ma <tao.ma@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>

parent ae0dff68

fs/ocfs2/mmap.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -113,7 +113,11 @@ static int __ocfs2_page_mkwrite(struct inode inode, struct buffer_head di_bh,
		* ocfs2_write_begin_nolock().
		*/
		if (!PageUptodate(page) \|\| page->mapping != inode->i_mapping) {
		ret = -EINVAL;
		/*
		* the page has been umapped in ocfs2_data_downconvert_worker.
		* So return 0 here and let VFS retry.
		*/
		ret = 0;
		goto out;
		}

Admin message