ceph: support inline data feature

[firefly-linux-kernel-4.4.55.git] / fs / btrfs / inode.c

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index fc9c0439caa314e131e1c23c384884b71bf84fb1..d23362f4464e9b7091654ed570e726dd9b7507b3 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -5261,42 +5261,6 @@ struct inode *btrfs_lookup_dentry(struct inode *dir, struct dentry *dentry)
                        iput(inode);
                        inode = ERR_PTR(ret);
                }
-               /*
-                * If orphan cleanup did remove any orphans, it means the tree
-                * was modified and therefore the commit root is not the same as
-                * the current root anymore. This is a problem, because send
-                * uses the commit root and therefore can see inode items that
-                * don't exist in the current root anymore, and for example make
-                * calls to btrfs_iget, which will do tree lookups based on the
-                * current root and not on the commit root. Those lookups will
-                * fail, returning a -ESTALE error, and making send fail with
-                * that error. So make sure a send does not see any orphans we
-                * have just removed, and that it will see the same inodes
-                * regardless of whether a transaction commit happened before
-                * it started (meaning that the commit root will be the same as
-                * the current root) or not.
-                */
-               if (sub_root->node != sub_root->commit_root) {
-                       u64 sub_flags = btrfs_root_flags(&sub_root->root_item);
-
-                       if (sub_flags & BTRFS_ROOT_SUBVOL_RDONLY) {
-                               struct extent_buffer *eb;
-
-                               /*
-                                * Assert we can't have races between dentry
-                                * lookup called through the snapshot creation
-                                * ioctl and the VFS.
-                                */
-                               ASSERT(mutex_is_locked(&dir->i_mutex));
-
-                               down_write(&root->fs_info->commit_root_sem);
-                               eb = sub_root->commit_root;
-                               sub_root->commit_root =
-                                       btrfs_root_node(sub_root);
-                               up_write(&root->fs_info->commit_root_sem);
-                               free_extent_buffer(eb);
-                       }
-               }
        }
 
        return inode;