aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/ctree.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 17dffe33e8d0..0a430f7c5afd 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -3143,7 +3143,7 @@ static int balance_node_right(struct btrfs_trans_handle *trans,
3143 */ 3143 */
3144static noinline int insert_new_root(struct btrfs_trans_handle *trans, 3144static noinline int insert_new_root(struct btrfs_trans_handle *trans,
3145 struct btrfs_root *root, 3145 struct btrfs_root *root,
3146 struct btrfs_path *path, int level, int log_removal) 3146 struct btrfs_path *path, int level)
3147{ 3147{
3148 u64 lower_gen; 3148 u64 lower_gen;
3149 struct extent_buffer *lower; 3149 struct extent_buffer *lower;
@@ -3194,7 +3194,7 @@ static noinline int insert_new_root(struct btrfs_trans_handle *trans,
3194 btrfs_mark_buffer_dirty(c); 3194 btrfs_mark_buffer_dirty(c);
3195 3195
3196 old = root->node; 3196 old = root->node;
3197 tree_mod_log_set_root_pointer(root, c, log_removal); 3197 tree_mod_log_set_root_pointer(root, c, 0);
3198 rcu_assign_pointer(root->node, c); 3198 rcu_assign_pointer(root->node, c);
3199 3199
3200 /* the super has an extra ref to root->node */ 3200 /* the super has an extra ref to root->node */
@@ -3278,14 +3278,14 @@ static noinline int split_node(struct btrfs_trans_handle *trans,
3278 /* 3278 /*
3279 * trying to split the root, lets make a new one 3279 * trying to split the root, lets make a new one
3280 * 3280 *
3281 * tree mod log: We pass 0 as log_removal parameter to 3281 * tree mod log: We don't log_removal old root in
3282 * insert_new_root, because that root buffer will be kept as a 3282 * insert_new_root, because that root buffer will be kept as a
3283 * normal node. We are going to log removal of half of the 3283 * normal node. We are going to log removal of half of the
3284 * elements below with tree_mod_log_eb_copy. We're holding a 3284 * elements below with tree_mod_log_eb_copy. We're holding a
3285 * tree lock on the buffer, which is why we cannot race with 3285 * tree lock on the buffer, which is why we cannot race with
3286 * other tree_mod_log users. 3286 * other tree_mod_log users.
3287 */ 3287 */
3288 ret = insert_new_root(trans, root, path, level + 1, 0); 3288 ret = insert_new_root(trans, root, path, level + 1);
3289 if (ret) 3289 if (ret)
3290 return ret; 3290 return ret;
3291 } else { 3291 } else {
@@ -4005,7 +4005,7 @@ static noinline int split_leaf(struct btrfs_trans_handle *trans,
4005 } 4005 }
4006 4006
4007 if (!path->nodes[1]) { 4007 if (!path->nodes[1]) {
4008 ret = insert_new_root(trans, root, path, 1, 1); 4008 ret = insert_new_root(trans, root, path, 1);
4009 if (ret) 4009 if (ret)
4010 return ret; 4010 return ret;
4011 } 4011 }