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/ufs/util.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/ufs/util.h')
| -rw-r--r-- | fs/ufs/util.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/ufs/util.h b/fs/ufs/util.h index 23ceed8c8fb9..0466036912f1 100644 --- a/fs/ufs/util.h +++ b/fs/ufs/util.h @@ -257,9 +257,7 @@ ufs_set_inode_gid(struct super_block *sb, struct ufs_inode *inode, u32 value) extern dev_t ufs_get_inode_dev(struct super_block *, struct ufs_inode_info *); extern void ufs_set_inode_dev(struct super_block *, struct ufs_inode_info *, dev_t); -extern int __ufs_write_begin(struct file *file, struct address_space *mapping, - loff_t pos, unsigned len, unsigned flags, - struct page **pagep, void **fsdata); +extern int ufs_prepare_chunk(struct page *page, loff_t pos, unsigned len); /* * These functions manipulate ufs buffers |