diff options
| author | Joel Becker <joel.becker@oracle.com> | 2010-09-10 17:41:04 +0200 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2010-09-10 17:41:04 +0200 |
| commit | 729963a1ff8d069d05dab6a024bfd59805ac622c (patch) | |
| tree | 5489aae570960d1908d738913ea581cc1689fbbb /fs/ocfs2/aops.c | |
| parent | ocfs2: Remove obsolete comments before ocfs2_start_trans. (diff) | |
| parent | ocfs2: Add readhead during CoW. (diff) | |
| download | linux-729963a1ff8d069d05dab6a024bfd59805ac622c.tar.xz linux-729963a1ff8d069d05dab6a024bfd59805ac622c.zip | |
Merge branch 'cow_readahead' of git://oss.oracle.com/git/tma/linux-2.6 into merge-2
Diffstat (limited to 'fs/ocfs2/aops.c')
| -rw-r--r-- | fs/ocfs2/aops.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index f477f18b35d5..5cfeee118158 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c @@ -1642,7 +1642,8 @@ static int ocfs2_zero_tail(struct inode *inode, struct buffer_head *di_bh, return ret; } -int ocfs2_write_begin_nolock(struct address_space *mapping, +int ocfs2_write_begin_nolock(struct file *filp, + struct address_space *mapping, loff_t pos, unsigned len, unsigned flags, struct page **pagep, void **fsdata, struct buffer_head *di_bh, struct page *mmap_page) @@ -1692,7 +1693,7 @@ int ocfs2_write_begin_nolock(struct address_space *mapping, mlog_errno(ret); goto out; } else if (ret == 1) { - ret = ocfs2_refcount_cow(inode, di_bh, + ret = ocfs2_refcount_cow(inode, filp, di_bh, wc->w_cpos, wc->w_clen, UINT_MAX); if (ret) { mlog_errno(ret); @@ -1854,7 +1855,7 @@ static int ocfs2_write_begin(struct file *file, struct address_space *mapping, */ down_write(&OCFS2_I(inode)->ip_alloc_sem); - ret = ocfs2_write_begin_nolock(mapping, pos, len, flags, pagep, + ret = ocfs2_write_begin_nolock(file, mapping, pos, len, flags, pagep, fsdata, di_bh, NULL); if (ret) { mlog_errno(ret); |