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/freevxfs | |
| parent | fd0961ff67727482bb20ca7e8ea97b83e9de2ddb (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'fs/freevxfs')
| -rw-r--r-- | fs/freevxfs/vxfs_lookup.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/freevxfs/vxfs_lookup.c b/fs/freevxfs/vxfs_lookup.c index aee049cb9f84..0ec7bb2c95c6 100644 --- a/fs/freevxfs/vxfs_lookup.c +++ b/fs/freevxfs/vxfs_lookup.c | |||
| @@ -57,6 +57,8 @@ const struct inode_operations vxfs_dir_inode_ops = { | |||
| 57 | }; | 57 | }; |
| 58 | 58 | ||
| 59 | const struct file_operations vxfs_dir_operations = { | 59 | const struct file_operations vxfs_dir_operations = { |
| 60 | .llseek = generic_file_llseek, | ||
| 61 | .read = generic_read_dir, | ||
| 60 | .readdir = vxfs_readdir, | 62 | .readdir = vxfs_readdir, |
| 61 | }; | 63 | }; |
| 62 | 64 | ||