diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-11-17 04:46:18 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-11-17 04:46:18 -0500 |
commit | 9dacc71ff31a008d1e689fc824d31f6696454f68 (patch) | |
tree | b792f9c30008e1ed469a73ead4339fdf8a50a5ce /fs/ocfs2/mmap.c | |
parent | 19f47c634ea8c5a10ff7bb1a08c52fd0f49bc54c (diff) | |
parent | 9bf1a2445f3c569098b8de7097ca324e65abecc2 (diff) |
Merge commit 'v2.6.28-rc5' into x86/cleanups
Diffstat (limited to 'fs/ocfs2/mmap.c')
-rw-r--r-- | fs/ocfs2/mmap.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/ocfs2/mmap.c b/fs/ocfs2/mmap.c index 3dc18d67557c..eea1d24713ea 100644 --- a/fs/ocfs2/mmap.c +++ b/fs/ocfs2/mmap.c | |||
@@ -113,7 +113,11 @@ static int __ocfs2_page_mkwrite(struct inode *inode, struct buffer_head *di_bh, | |||
113 | * ocfs2_write_begin_nolock(). | 113 | * ocfs2_write_begin_nolock(). |
114 | */ | 114 | */ |
115 | if (!PageUptodate(page) || page->mapping != inode->i_mapping) { | 115 | if (!PageUptodate(page) || page->mapping != inode->i_mapping) { |
116 | ret = -EINVAL; | 116 | /* |
117 | * the page has been umapped in ocfs2_data_downconvert_worker. | ||
118 | * So return 0 here and let VFS retry. | ||
119 | */ | ||
120 | ret = 0; | ||
117 | goto out; | 121 | goto out; |
118 | } | 122 | } |
119 | 123 | ||