diff options
author | Steve French <sfrench@us.ibm.com> | 2008-08-27 22:47:00 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2008-08-27 22:47:00 -0400 |
commit | 6405c9cd9bf7b1c35ed76ef8ee3e217056285702 (patch) | |
tree | 0659c9ae17d1375f185f88f4f7fef1a667f375d8 /fs/adfs/dir.c | |
parent | bcc55c6664a90146149ba0fd93052adc94287b9f (diff) | |
parent | 4c246edd2550304df5b766cc841584b2bb058843 (diff) |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/adfs/dir.c')
-rw-r--r-- | fs/adfs/dir.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/adfs/dir.c b/fs/adfs/dir.c index fc1a8dc64d78..85a30e929800 100644 --- a/fs/adfs/dir.c +++ b/fs/adfs/dir.c | |||
@@ -197,6 +197,7 @@ out: | |||
197 | 197 | ||
198 | const struct file_operations adfs_dir_operations = { | 198 | const struct file_operations adfs_dir_operations = { |
199 | .read = generic_read_dir, | 199 | .read = generic_read_dir, |
200 | .llseek = generic_file_llseek, | ||
200 | .readdir = adfs_readdir, | 201 | .readdir = adfs_readdir, |
201 | .fsync = file_fsync, | 202 | .fsync = file_fsync, |
202 | }; | 203 | }; |