diff options
| author | Chris Zankel <chris@zankel.net> | 2009-04-03 05:29:05 -0400 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2009-04-03 05:29:05 -0400 |
| commit | 65127d28e312bb6b38ce84a7bb71d762ef63ad4c (patch) | |
| tree | d5fdf52a2d0731f7fab0ce0ed394faac50b04fbc /include/linux/ext3_fs.h | |
| parent | b8bb76713ec50df2f11efee386e16f93d51e1076 (diff) | |
| parent | 8fe74cf053de7ad2124a894996f84fa890a81093 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into merge
Diffstat (limited to 'include/linux/ext3_fs.h')
| -rw-r--r-- | include/linux/ext3_fs.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h index dd495b8c3091..e263acaa405b 100644 --- a/include/linux/ext3_fs.h +++ b/include/linux/ext3_fs.h | |||
| @@ -893,9 +893,8 @@ extern int ext3_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, | |||
| 893 | u64 start, u64 len); | 893 | u64 start, u64 len); |
| 894 | 894 | ||
| 895 | /* ioctl.c */ | 895 | /* ioctl.c */ |
| 896 | extern int ext3_ioctl (struct inode *, struct file *, unsigned int, | 896 | extern long ext3_ioctl(struct file *, unsigned int, unsigned long); |
| 897 | unsigned long); | 897 | extern long ext3_compat_ioctl(struct file *, unsigned int, unsigned long); |
| 898 | extern long ext3_compat_ioctl (struct file *, unsigned int, unsigned long); | ||
| 899 | 898 | ||
| 900 | /* namei.c */ | 899 | /* namei.c */ |
| 901 | extern int ext3_orphan_add(handle_t *, struct inode *); | 900 | extern int ext3_orphan_add(handle_t *, struct inode *); |