diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-06-16 12:08:13 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-06-16 12:08:13 -0400 |
| commit | f1bbbb6912662b9f6070c5bfc4ca9eb1f06a9d5b (patch) | |
| tree | c2c130a74be25b0b2dff992e1a195e2728bdaadd /fs/hfsplus/dir.c | |
| parent | fd0961ff67727482bb20ca7e8ea97b83e9de2ddb (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'fs/hfsplus/dir.c')
| -rw-r--r-- | fs/hfsplus/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c index 5f4023678251..764fd1bdca88 100644 --- a/fs/hfsplus/dir.c +++ b/fs/hfsplus/dir.c | |||
| @@ -494,7 +494,7 @@ const struct inode_operations hfsplus_dir_inode_operations = { | |||
| 494 | const struct file_operations hfsplus_dir_operations = { | 494 | const struct file_operations hfsplus_dir_operations = { |
| 495 | .read = generic_read_dir, | 495 | .read = generic_read_dir, |
| 496 | .readdir = hfsplus_readdir, | 496 | .readdir = hfsplus_readdir, |
| 497 | .ioctl = hfsplus_ioctl, | 497 | .unlocked_ioctl = hfsplus_ioctl, |
| 498 | .llseek = generic_file_llseek, | 498 | .llseek = generic_file_llseek, |
| 499 | .release = hfsplus_dir_release, | 499 | .release = hfsplus_dir_release, |
| 500 | }; | 500 | }; |