diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-21 12:08:21 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-21 12:08:21 -0500 |
| commit | ac58c9059da8886b5e8cde012a80266b18ca146e (patch) | |
| tree | 40bf486843a2cace6c3a959d73423e50e6aa0c00 /fs/jfs/file.c | |
| parent | df6db302cb236ac3a683d535a3e2073d9f4b2833 (diff) | |
| parent | c4a1745aa09fc110afdefea0e5d025043e348bae (diff) | |
Merge branch 'linus'
Diffstat (limited to 'fs/jfs/file.c')
| -rw-r--r-- | fs/jfs/file.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/jfs/file.c b/fs/jfs/file.c index c2c19c9ed9a4..e1ac6e497e2b 100644 --- a/fs/jfs/file.c +++ b/fs/jfs/file.c | |||
| @@ -113,4 +113,5 @@ struct file_operations jfs_file_operations = { | |||
| 113 | .sendfile = generic_file_sendfile, | 113 | .sendfile = generic_file_sendfile, |
| 114 | .fsync = jfs_fsync, | 114 | .fsync = jfs_fsync, |
| 115 | .release = jfs_release, | 115 | .release = jfs_release, |
| 116 | .ioctl = jfs_ioctl, | ||
| 116 | }; | 117 | }; |