diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 14:17:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 14:17:43 -0400 |
| commit | d515e86e639890b33a09390d062b0831664f04a2 (patch) | |
| tree | 37aea609704ce28ad44840279b95725e07c19a43 /fs/udf/udfdecl.h | |
| parent | 79c4581262e225a7c96d88b632b05ab3b5e9a52c (diff) | |
| parent | 2f07a88b30f510c7625d75cdf286903b465350a0 (diff) | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
udf: BKL ioctl pushdown
Diffstat (limited to 'fs/udf/udfdecl.h')
| -rw-r--r-- | fs/udf/udfdecl.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h index 702a1148e702..9079ff7d6255 100644 --- a/fs/udf/udfdecl.h +++ b/fs/udf/udfdecl.h | |||
| @@ -130,8 +130,7 @@ extern int udf_write_fi(struct inode *inode, struct fileIdentDesc *, | |||
| 130 | uint8_t *, uint8_t *); | 130 | uint8_t *, uint8_t *); |
| 131 | 131 | ||
| 132 | /* file.c */ | 132 | /* file.c */ |
| 133 | extern int udf_ioctl(struct inode *, struct file *, unsigned int, | 133 | extern long udf_ioctl(struct file *, unsigned int, unsigned long); |
| 134 | unsigned long); | ||
| 135 | extern int udf_setattr(struct dentry *dentry, struct iattr *iattr); | 134 | extern int udf_setattr(struct dentry *dentry, struct iattr *iattr); |
| 136 | /* inode.c */ | 135 | /* inode.c */ |
| 137 | extern struct inode *udf_iget(struct super_block *, struct kernel_lb_addr *); | 136 | extern struct inode *udf_iget(struct super_block *, struct kernel_lb_addr *); |