Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[deliverable/linux.git] / fs / squashfs / dir.c

diff --git a/fs/squashfs/dir.c b/fs/squashfs/dir.c
index d8c2d747be28d183542a0f2bd4a5d18060436783..a5845f94a2a1790e9392e545bccfe6b3df5f545b 100644 (file)
--- a/fs/squashfs/dir.c
+++ b/fs/squashfs/dir.c
@@ -231,6 +231,6 @@ failed_read:
 
 const struct file_operations squashfs_dir_ops = {
        .read = generic_read_dir,
-       .iterate = squashfs_readdir,
-       .llseek = default_llseek,
+       .iterate_shared = squashfs_readdir,
+       .llseek = generic_file_llseek,
 };