diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2015-01-22 14:08:16 -0500 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-05-27 19:39:53 +0200 |
| commit | 70d9ee8808b252acefe0113e256f998028e308c8 (patch) | |
| tree | 722cdf3a8f4c616469dd093ed39ee535991ea152 /fs | |
| parent | d75df15e1d1bcbfe5c20a0bcb4d0762401650f5e (diff) | |
ext4: use old interface for ext4_readdir()
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/dir.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c index c24143ea9..85fa814ed 100644 --- a/fs/ext4/dir.c +++ b/fs/ext4/dir.c @@ -26,6 +26,7 @@ #include <linux/buffer_head.h> #include <linux/slab.h> #include <linux/rbtree.h> +#include <linux/fsnotify.h> #include "ext4.h" #include "xattr.h" @@ -102,7 +103,7 @@ int __ext4_check_dir_entry(const char *function, unsigned int line, return 1; } -static int ext4_readdir(struct file *file, struct dir_context *ctx) +static int ext4_readdir2(struct file *file, struct dir_context *ctx) { unsigned int offset; int i; @@ -247,6 +248,18 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx) return 0; } +static int ext4_readdir(struct file *file, + void *dirent, filldir_t filldir) +{ + struct dir_context ctx = { filldir, dirent, file->f_pos }; + int ret; + + ret = ext4_readdir2(file, &ctx); + file->f_pos = ctx.pos; + fsnotify_access(file); + return ret; +} + static inline int is_32bit_api(void) { #ifdef CONFIG_COMPAT @@ -597,7 +610,7 @@ int ext4_check_all_de(struct inode *dir, struct buffer_head *bh, void *buf, const struct file_operations ext4_dir_operations = { .llseek = ext4_dir_llseek, .read = generic_read_dir, - .iterate = ext4_readdir, + .readdir = ext4_readdir, .unlocked_ioctl = ext4_ioctl, #ifdef CONFIG_COMPAT .compat_ioctl = ext4_compat_ioctl, |