From a2e3711ffad4e96d95123e702a2528b9b8099b4a Mon Sep 17 00:00:00 2001 From: Erez Zadok Date: Tue, 19 Nov 2013 17:17:31 -0500 Subject: [PATCH] Wrapfs: ->readdir op now ->iterate Signed-off-by: Erez Zadok --- fs/wrapfs/file.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/wrapfs/file.c b/fs/wrapfs/file.c index 982581635442..2aefae408c46 100644 --- a/fs/wrapfs/file.c +++ b/fs/wrapfs/file.c @@ -48,14 +48,14 @@ static ssize_t wrapfs_write(struct file *file, const char __user *buf, return err; } -static int wrapfs_readdir(struct file *file, void *dirent, filldir_t filldir) +static int wrapfs_readdir(struct file *file, struct dir_context *ctx) { int err = 0; struct file *lower_file = NULL; struct dentry *dentry = file->f_path.dentry; lower_file = wrapfs_lower_file(file); - err = vfs_readdir(lower_file, filldir, dirent); + err = iterate_dir(lower_file, ctx); file->f_pos = lower_file->f_pos; if (err >= 0) /* copy the atime */ fsstack_copy_attr_atime(dentry->d_inode, @@ -282,7 +282,7 @@ const struct file_operations wrapfs_main_fops = { const struct file_operations wrapfs_dir_fops = { .llseek = generic_file_llseek, .read = generic_read_dir, - .readdir = wrapfs_readdir, + .iterate = wrapfs_readdir, .unlocked_ioctl = wrapfs_unlocked_ioctl, #ifdef CONFIG_COMPAT .compat_ioctl = wrapfs_compat_ioctl, -- 2.34.1