]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
Revert "btrfs: switch to ->iterate_shared()"
authorAl Viro <viro@zeniv.linux.org.uk>
Wed, 18 May 2016 17:15:05 +0000 (13:15 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Wed, 18 May 2016 17:19:17 +0000 (13:19 -0400)
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>
fs/btrfs/inode.c

index 3e2ada1267f34d582a5411120e147db5a16eff3f..2aaba58b4856be3fc6b179ad3e2d0e94e559dc04 100644 (file)
@@ -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,