diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-01 05:55:03 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-01 05:55:03 +0200 |
| commit | e993835441734c184d70d3716eed78a08eeb71c2 (patch) | |
| tree | 583aa17813cdae1c4640e353f8c6df3f197e7548 /fs/ext2/file.c | |
| parent | [PATCH] libata: turn off NCQ if queue depth is adjusted to 1 (diff) | |
| parent | [PATCH] SCSI: fix request flag-related build breakage (diff) | |
| download | linux-e993835441734c184d70d3716eed78a08eeb71c2.tar.xz linux-e993835441734c184d70d3716eed78a08eeb71c2.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'fs/ext2/file.c')
| -rw-r--r-- | fs/ext2/file.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/ext2/file.c b/fs/ext2/file.c index 23e2c7ccec1d..e8bbed9dd268 100644 --- a/fs/ext2/file.c +++ b/fs/ext2/file.c @@ -46,6 +46,9 @@ const struct file_operations ext2_file_operations = { .aio_read = generic_file_aio_read, .aio_write = generic_file_aio_write, .ioctl = ext2_ioctl, +#ifdef CONFIG_COMPAT + .compat_ioctl = ext2_compat_ioctl, +#endif .mmap = generic_file_mmap, .open = generic_file_open, .release = ext2_release_file, @@ -63,6 +66,9 @@ const struct file_operations ext2_xip_file_operations = { .read = xip_file_read, .write = xip_file_write, .ioctl = ext2_ioctl, +#ifdef CONFIG_COMPAT + .compat_ioctl = ext2_compat_ioctl, +#endif .mmap = xip_file_mmap, .open = generic_file_open, .release = ext2_release_file, |