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/jfs/jfs_inode.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/jfs/jfs_inode.h')
| -rw-r--r-- | fs/jfs/jfs_inode.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jfs/jfs_inode.h b/fs/jfs/jfs_inode.h index 11042b1f44b5..155e91eff07d 100644 --- a/fs/jfs/jfs_inode.h +++ b/fs/jfs/jfs_inode.h @@ -27,7 +27,7 @@ extern long jfs_compat_ioctl(struct file *, unsigned int, unsigned long); extern struct inode *jfs_iget(struct super_block *, unsigned long); extern int jfs_commit_inode(struct inode *, int); extern int jfs_write_inode(struct inode *, struct writeback_control *); -extern void jfs_delete_inode(struct inode *); +extern void jfs_evict_inode(struct inode *); extern void jfs_dirty_inode(struct inode *); extern void jfs_truncate(struct inode *); extern void jfs_truncate_nolock(struct inode *, loff_t); |