Merge with /home/shaggy/git/linus-clean/

[karo-tx-linux.git] / fs / jfs / file.c

diff --git a/fs/jfs/file.c b/fs/jfs/file.c
index c2c19c9ed9a40b45d5ff591e2218251a309a4f97..e1ac6e497e2be67829bbc583ea545ae645ebf97d 100644 (file)
--- a/fs/jfs/file.c
+++ b/fs/jfs/file.c
@@ -113,4 +113,5 @@ struct file_operations jfs_file_operations = {
        .sendfile       = generic_file_sendfile,
        .fsync          = jfs_fsync,
        .release        = jfs_release,
+       .ioctl          = jfs_ioctl,
 };