Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep...

[karo-tx-linux.git] / fs / ubifs / dir.c

diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
index 795992a8321e9e0c9531c92f97c91cc10835cc02..34a5356d0ce7eaefc447b2b046f6cfce4a2d8353 100644 (file)
--- a/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@ -1195,7 +1195,7 @@ const struct file_operations ubifs_dir_operations = {
        .llseek         = generic_file_llseek,
        .release        = ubifs_dir_release,
        .read           = generic_read_dir,
-       .iterate        = ubifs_readdir,
+       .iterate_shared = ubifs_readdir,
        .fsync          = ubifs_fsync,
        .unlocked_ioctl = ubifs_ioctl,
 #ifdef CONFIG_COMPAT