lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ocfs2: make __ocfs2_page_mkwrite handle file end properly.

Browse Source 
__ocfs2_page_mkwrite now is broken in handling file end.
1. the last page should be the page contains i_size - 1.
2. the len in the last page is also calculated wrong.
So change them accordingly.

Acked-by: Mark Fasheh <mfasheh@suse.com>
Signed-off-by: Tao Ma <tao.ma@oracle.com>
This commit is contained in:
Tao Ma
2010-07-17 21:45:49 +08:00
parent f5ce5a08a4
commit f63afdb2c3
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fs/ocfs2/mmap.c
View File

@@ -74,9 +74,11 @@ static int __ocfs2_page_mkwrite(struct inode *inode, struct buffer_head *di_bh,
/* /*
* Another node might have truncated while we were waiting on * Another node might have truncated while we were waiting on
* cluster locks. * cluster locks.
* We don't check size == 0 before the shift. This is borrowed
* from do_generic_file_read.
*/ */
last_index = size >> PAGE_CACHE_SHIFT; last_index = (size - 1) >> PAGE_CACHE_SHIFT;
if (page->index > last_index) { if (unlikely(!size || page->index > last_index)) {
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} }
@@ -107,7 +109,7 @@ static int __ocfs2_page_mkwrite(struct inode *inode, struct buffer_head *di_bh,
* because the "write" would invalidate their data. * because the "write" would invalidate their data.
*/ */
if (page->index == last_index) if (page->index == last_index)
len = size & ~PAGE_CACHE_MASK; len = ((size - 1) & ~PAGE_CACHE_MASK) + 1;
ret = ocfs2_write_begin_nolock(mapping, pos, len, 0, &locked_page, ret = ocfs2_write_begin_nolock(mapping, pos, len, 0, &locked_page,
&fsdata, di_bh, page); &fsdata, di_bh, page);