diff options
| author | Joel Becker <joel.becker@oracle.com> | 2010-09-10 11:41:04 -0400 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2010-09-10 11:41:04 -0400 |
| commit | 729963a1ff8d069d05dab6a024bfd59805ac622c (patch) | |
| tree | 5489aae570960d1908d738913ea581cc1689fbbb /fs/ocfs2/aops.h | |
| parent | 17ae521158d6fe89cfdd00a9990aa40d02e81391 (diff) | |
| parent | 6ea4843f53282465f2bdbe5eedde7d8c3081dfdf (diff) | |
Merge branch 'cow_readahead' of git://oss.oracle.com/git/tma/linux-2.6 into merge-2
Diffstat (limited to 'fs/ocfs2/aops.h')
| -rw-r--r-- | fs/ocfs2/aops.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ocfs2/aops.h b/fs/ocfs2/aops.h index c48e93ffc513..7606f663da6d 100644 --- a/fs/ocfs2/aops.h +++ b/fs/ocfs2/aops.h | |||
| @@ -48,7 +48,8 @@ int ocfs2_write_end_nolock(struct address_space *mapping, | |||
| 48 | loff_t pos, unsigned len, unsigned copied, | 48 | loff_t pos, unsigned len, unsigned copied, |
| 49 | struct page *page, void *fsdata); | 49 | struct page *page, void *fsdata); |
| 50 | 50 | ||
| 51 | int ocfs2_write_begin_nolock(struct address_space *mapping, | 51 | int ocfs2_write_begin_nolock(struct file *filp, |
| 52 | struct address_space *mapping, | ||
| 52 | loff_t pos, unsigned len, unsigned flags, | 53 | loff_t pos, unsigned len, unsigned flags, |
| 53 | struct page **pagep, void **fsdata, | 54 | struct page **pagep, void **fsdata, |
| 54 | struct buffer_head *di_bh, struct page *mmap_page); | 55 | struct buffer_head *di_bh, struct page *mmap_page); |