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 /fs/ext3/file.c | |
| 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 'fs/ext3/file.c')
| -rw-r--r-- | fs/ext3/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext3/file.c b/fs/ext3/file.c index 3be1e0689c9a..521f8238b2fa 100644 --- a/fs/ext3/file.c +++ b/fs/ext3/file.c | |||
| @@ -112,7 +112,7 @@ const struct file_operations ext3_file_operations = { | |||
| 112 | .write = do_sync_write, | 112 | .write = do_sync_write, |
| 113 | .aio_read = generic_file_aio_read, | 113 | .aio_read = generic_file_aio_read, |
| 114 | .aio_write = ext3_file_write, | 114 | .aio_write = ext3_file_write, |
| 115 | .ioctl = ext3_ioctl, | 115 | .unlocked_ioctl = ext3_ioctl, |
| 116 | #ifdef CONFIG_COMPAT | 116 | #ifdef CONFIG_COMPAT |
| 117 | .compat_ioctl = ext3_compat_ioctl, | 117 | .compat_ioctl = ext3_compat_ioctl, |
| 118 | #endif | 118 | #endif |