diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-27 23:31:44 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-27 23:31:44 +0200 |
| commit | 5b51a7e9d84f19df4d532ebf5624dbb8ad0d6c9c (patch) | |
| tree | aa8359921a8039474c7bb1544823184855e59694 /fs/affs/dir.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| parent | [PATCH] deal with the first call of ->show() generating no output (diff) | |
| download | linux-5b51a7e9d84f19df4d532ebf5624dbb8ad0d6c9c.tar.xz linux-5b51a7e9d84f19df4d532ebf5624dbb8ad0d6c9c.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
[PATCH] deal with the first call of ->show() generating no output
[PATCH] fix ->llseek() for a bunch of directories
[PATCH] fix regular readdir() and friends
[PATCH] fix hpux_getdents()
[PATCH] fix osf_getdirents()
[PATCH] ntfs: use d_add_ci
[PATCH] change d_add_ci argument ordering
[PATCH] fix efs_lookup()
[PATCH] proc: inode number fixlet
Diffstat (limited to 'fs/affs/dir.c')
| -rw-r--r-- | fs/affs/dir.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/affs/dir.c b/fs/affs/dir.c index 6e3f282424b0..7b36904dbeac 100644 --- a/fs/affs/dir.c +++ b/fs/affs/dir.c @@ -19,6 +19,7 @@ static int affs_readdir(struct file *, void *, filldir_t); const struct file_operations affs_dir_operations = { .read = generic_read_dir, + .llseek = generic_file_llseek, .readdir = affs_readdir, .fsync = file_fsync, }; |