From: Joel Becker <joel.becker@oracle.com>
Date: Fri, 10 Sep 2010 15:41:04 +0000 (-0700)
Subject: Merge branch 'cow_readahead' of git://oss.oracle.com/git/tma/linux-2.6 into merge-2
X-Git-Tag: v2.6.37-rc1~182^2~14
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=729963a1ff8d069d05dab6a024bfd59805ac622c;p=cascardo%2Flinux.git

Merge branch 'cow_readahead' of git://oss.oracle.com/git/tma/linux-2.6 into merge-2
---

729963a1ff8d069d05dab6a024bfd59805ac622c
diff --cc fs/ocfs2/mmap.c
index 4c18f4ad93b4,b04d6961c0d4..7e32db9c2c99
--- a/fs/ocfs2/mmap.c
+++ b/fs/ocfs2/mmap.c
@@@ -109,9 -108,9 +110,9 @@@ static int __ocfs2_page_mkwrite(struct 
  	 * 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,
+ 	ret = ocfs2_write_begin_nolock(file, mapping, pos, len, 0, &locked_page,
  				       &fsdata, di_bh, page);
  	if (ret) {
  		if (ret != -ENOSPC)