diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-08 11:43:23 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-08 11:43:30 +1000 |
| commit | c483d69b2d42d746a7e1f6574a38d7b1a643c0ca (patch) | |
| tree | 8b549889f1289a174aed4b2d46f009e3ec39a7be /fs/sysv/sysv.h | |
| parent | 071b2ce1fa20bf2dc7d77375ea91cf8241cfc33b (diff) | |
| parent | 9a906772183b579c576b3562cae87b7012dcd1c6 (diff) | |
Merge remote branch 'vfs/for-next'
Conflicts:
fs/nilfs2/super.c
fs/xfs/linux-2.6/xfs_super.c
Diffstat (limited to 'fs/sysv/sysv.h')
| -rw-r--r-- | fs/sysv/sysv.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h index 94cb9b4d76c2..bb55cdb394bf 100644 --- a/fs/sysv/sysv.h +++ b/fs/sysv/sysv.h @@ -136,9 +136,7 @@ extern unsigned long sysv_count_free_blocks(struct super_block *); /* itree.c */ extern void sysv_truncate(struct inode *); -extern int __sysv_write_begin(struct file *file, struct address_space *mapping, - loff_t pos, unsigned len, unsigned flags, - struct page **pagep, void **fsdata); +extern int sysv_prepare_chunk(struct page *page, loff_t pos, unsigned len); /* inode.c */ extern struct inode *sysv_iget(struct super_block *, unsigned int); |