diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-05-13 02:36:01 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-05-13 02:36:01 +0200 |
| commit | ae05327a00fd47c34dfe25294b359a3f3fef96e8 (patch) | |
| tree | edcaac0eda8abcfaad9e9bd2b6ea72dd7306d374 /fs/ext4/dir.c | |
| parent | hfs: switch to ->iterate_shared() (diff) | |
| download | linux-ae05327a00fd47c34dfe25294b359a3f3fef96e8.tar.xz linux-ae05327a00fd47c34dfe25294b359a3f3fef96e8.zip | |
ext4: switch to ->iterate_shared()
Note that we need relax_dir() equivalent for directories
locked shared.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ext4/dir.c')
| -rw-r--r-- | fs/ext4/dir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c index 561d7308b393..5d00bf060254 100644 --- a/fs/ext4/dir.c +++ b/fs/ext4/dir.c @@ -266,7 +266,7 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx) ctx->pos += ext4_rec_len_from_disk(de->rec_len, sb->s_blocksize); } - if ((ctx->pos < inode->i_size) && !dir_relax(inode)) + if ((ctx->pos < inode->i_size) && !dir_relax_shared(inode)) goto done; brelse(bh); bh = NULL; @@ -644,7 +644,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, + .iterate_shared = ext4_readdir, .unlocked_ioctl = ext4_ioctl, #ifdef CONFIG_COMPAT .compat_ioctl = ext4_compat_ioctl, |