diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 13:21:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 13:21:02 -0800 |
| commit | df922075f2a55b1ae71a6fe589c1cc1b91381f4f (patch) | |
| tree | d0967cdb5b20d2da7e669522a5e450616697f180 /fs/jfs/file.c | |
| parent | 6e5565f949af1322f8f3d3f43d044645ae448499 (diff) | |
| parent | ef1fc2f01e02951a0d8520ec3aa0b38606d74b55 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
BKL-removal: Implement a compat_ioctl handler for JFS
BKL-removal: Use unlocked_ioctl for jfs
Diffstat (limited to 'fs/jfs/file.c')
| -rw-r--r-- | fs/jfs/file.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/jfs/file.c b/fs/jfs/file.c index 87eb93694af..7f6063acaa3 100644 --- a/fs/jfs/file.c +++ b/fs/jfs/file.c @@ -112,5 +112,8 @@ const struct file_operations jfs_file_operations = { .splice_write = generic_file_splice_write, .fsync = jfs_fsync, .release = jfs_release, - .ioctl = jfs_ioctl, + .unlocked_ioctl = jfs_ioctl, +#ifdef CONFIG_COMPAT + .compat_ioctl = jfs_compat_ioctl, +#endif }; |