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

diff --cc fs/ocfs2/aops.c
Simple merge

diff --cc fs/ocfs2/file.c
Simple merge

diff --cc fs/ocfs2/mmap.c
index 4c18f4ad93b43cae6e5ddcd5a2781fbc79292484,b04d6961c0d4d29dfd1394496fea37665746dcd4..7e32db9c2c993b38e67f5d1282525f0a089b54b0
--- 1/fs/ocfs2/mmap.c
--- 2/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)

diff --cc fs/ocfs2/refcounttree.c
Simple merge

diff --cc fs/ocfs2/refcounttree.h
Simple merge