Merge remote-tracking branch 'airlied/drm-next' into topic/drm-misc

[linux-beck.git] / fs / ecryptfs / file.c

diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c
index f02404052b7b66c73809f8bc33c93f07acab4a9b..7000b96b783ef04a56f056a83df595c8093533aa 100644 (file)
--- a/fs/ecryptfs/file.c
+++ b/fs/ecryptfs/file.c
@@ -383,7 +383,7 @@ ecryptfs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 #endif
 
 const struct file_operations ecryptfs_dir_fops = {
-       .iterate = ecryptfs_readdir,
+       .iterate_shared = ecryptfs_readdir,
        .read = generic_read_dir,
        .unlocked_ioctl = ecryptfs_unlocked_ioctl,
 #ifdef CONFIG_COMPAT