diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2016-05-18 13:15:05 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-05-18 13:19:17 -0400 |
commit | fe742fd4f90fa53cf31296bc5131ae1cdd6d84bb (patch) | |
tree | 72737093c807234b5a1dbc9ad1d858b7d74e11bc /fs/btrfs | |
parent | ae05327a00fd47c34dfe25294b359a3f3fef96e8 (diff) | |
download | op-kernel-dev-fe742fd4f90fa53cf31296bc5131ae1cdd6d84bb.zip op-kernel-dev-fe742fd4f90fa53cf31296bc5131ae1cdd6d84bb.tar.gz |
Revert "btrfs: switch to ->iterate_shared()"
This reverts commit 972b241f8441dc37a3f89dcd7e71d7f013873d13.
Quoth Chris:
didn't take the delayed inode stuff into account
it got an rbtree of items and it pulls things out
so in shared mode, its hugely racey
sorry, lets revert and fix it for real inside of btrfs
Signed-off-by: Chris Mason <clm@fb.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/btrfs')
-rw-r--r-- | fs/btrfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 3e2ada1..2aaba58 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -10181,7 +10181,7 @@ static const struct inode_operations btrfs_dir_ro_inode_operations = { static const struct file_operations btrfs_dir_file_operations = { .llseek = generic_file_llseek, .read = generic_read_dir, - .iterate_shared = btrfs_real_readdir, + .iterate = btrfs_real_readdir, .unlocked_ioctl = btrfs_ioctl, #ifdef CONFIG_COMPAT .compat_ioctl = btrfs_ioctl, |