diff options
Diffstat (limited to 'module/zfs/zpl_file.c')
| -rw-r--r-- | module/zfs/zpl_file.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/module/zfs/zpl_file.c b/module/zfs/zpl_file.c index 1c5f5e409..e03a0481c 100644 --- a/module/zfs/zpl_file.c +++ b/module/zfs/zpl_file.c @@ -76,7 +76,7 @@ zpl_release(struct inode *ip, struct file *filp) } static int -zpl_iterate(struct file *filp, struct dir_context *ctx) +zpl_iterate(struct file *filp, zpl_dir_context_t *ctx) { cred_t *cr = CRED(); int error; @@ -96,7 +96,8 @@ zpl_iterate(struct file *filp, struct dir_context *ctx) static int zpl_readdir(struct file *filp, void *dirent, filldir_t filldir) { - struct dir_context ctx = DIR_CONTEXT_INIT(dirent, filldir, filp->f_pos); + zpl_dir_context_t ctx = + ZPL_DIR_CONTEXT_INIT(dirent, filldir, filp->f_pos); int error; error = zpl_iterate(filp, &ctx); @@ -104,7 +105,7 @@ zpl_readdir(struct file *filp, void *dirent, filldir_t filldir) return (error); } -#endif /* HAVE_VFS_ITERATE */ +#endif /* !HAVE_VFS_ITERATE && !HAVE_VFS_ITERATE_SHARED */ #if defined(HAVE_FSYNC_WITH_DENTRY) /* @@ -965,7 +966,7 @@ const struct file_operations zpl_file_operations = { const struct file_operations zpl_dir_file_operations = { .llseek = generic_file_llseek, .read = generic_read_dir, -#ifdef HAVE_VFS_ITERATE_SHARED +#if defined(HAVE_VFS_ITERATE_SHARED) .iterate_shared = zpl_iterate, #elif defined(HAVE_VFS_ITERATE) .iterate = zpl_iterate, |