diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /fs/reiserfs/file.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'fs/reiserfs/file.c')
| -rw-r--r-- | fs/reiserfs/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c index 9f436668b7f8..1d9c12714c5c 100644 --- a/fs/reiserfs/file.c +++ b/fs/reiserfs/file.c | |||
| @@ -284,12 +284,12 @@ static ssize_t reiserfs_file_write(struct file *file, /* the file we are going t | |||
| 284 | const struct file_operations reiserfs_file_operations = { | 284 | const struct file_operations reiserfs_file_operations = { |
| 285 | .read = do_sync_read, | 285 | .read = do_sync_read, |
| 286 | .write = reiserfs_file_write, | 286 | .write = reiserfs_file_write, |
| 287 | .ioctl = reiserfs_ioctl, | 287 | .unlocked_ioctl = reiserfs_ioctl, |
| 288 | #ifdef CONFIG_COMPAT | 288 | #ifdef CONFIG_COMPAT |
| 289 | .compat_ioctl = reiserfs_compat_ioctl, | 289 | .compat_ioctl = reiserfs_compat_ioctl, |
| 290 | #endif | 290 | #endif |
| 291 | .mmap = reiserfs_file_mmap, | 291 | .mmap = reiserfs_file_mmap, |
| 292 | .open = generic_file_open, | 292 | .open = dquot_file_open, |
| 293 | .release = reiserfs_file_release, | 293 | .release = reiserfs_file_release, |
| 294 | .fsync = reiserfs_sync_file, | 294 | .fsync = reiserfs_sync_file, |
| 295 | .aio_read = generic_file_aio_read, | 295 | .aio_read = generic_file_aio_read, |