diff options
| author | Tao Ma <tao.ma@oracle.com> | 2010-07-17 21:45:49 +0800 |
|---|---|---|
| committer | Tao Ma <tao.ma@oracle.com> | 2010-09-08 14:25:55 +0800 |
| commit | f63afdb2c32db850fa1bfccf84643a8885cbeb61 (patch) | |
| tree | 051bd8feb6eeb546d562e325157526dbc1018e49 | |
| parent | f5ce5a08a40f2086435858ddc80cb40394b082eb (diff) | |
| download | blackbird-op-linux-f63afdb2c32db850fa1bfccf84643a8885cbeb61.tar.gz blackbird-op-linux-f63afdb2c32db850fa1bfccf84643a8885cbeb61.zip | |
ocfs2: make __ocfs2_page_mkwrite handle file end properly.
__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>
| -rw-r--r-- | fs/ocfs2/mmap.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/ocfs2/mmap.c b/fs/ocfs2/mmap.c index af2b8fe1f139..4c18f4ad93b4 100644 --- a/fs/ocfs2/mmap.c +++ b/fs/ocfs2/mmap.c @@ -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 * 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; - if (page->index > last_index) { + last_index = (size - 1) >> PAGE_CACHE_SHIFT; + if (unlikely(!size || page->index > last_index)) { ret = -EINVAL; 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. */ 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, &fsdata, di_bh, page); |
