diff --git a/[refs] b/[refs] index 94099aee0779..dd3d42edfcb9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 70b8902199003b098fde86d1db02e7465115a02c +refs/heads/master: 323ef68faf1bbd9b1e66aea268fd09d358d7e8ab diff --git a/trunk/fs/ecryptfs/file.c b/trunk/fs/ecryptfs/file.c index 81e10e6a9443..7d1050e254f9 100644 --- a/trunk/fs/ecryptfs/file.c +++ b/trunk/fs/ecryptfs/file.c @@ -317,6 +317,7 @@ ecryptfs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) const struct file_operations ecryptfs_dir_fops = { .readdir = ecryptfs_readdir, + .read = generic_read_dir, .unlocked_ioctl = ecryptfs_unlocked_ioctl, #ifdef CONFIG_COMPAT .compat_ioctl = ecryptfs_compat_ioctl,