diff options
author | Chris Mason <chris.mason@fusionio.com> | 2013-05-17 21:53:17 -0400 |
---|---|---|
committer | Chris Mason <chris.mason@fusionio.com> | 2013-05-17 21:53:17 -0400 |
commit | c5cb6a0573bef87e098ee3cd946115ebe60a910e (patch) | |
tree | 49b64747b7af6b1024b25470cba583fa7dafe531 /fs/btrfs/ctree.c | |
parent | 9be3395bcd4ad4af76476ac38152b4cafa6b6159 (diff) | |
parent | 655b09fe540b73edeaabfb4c2d700be51a1f8bce (diff) |
Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-next
Diffstat (limited to 'fs/btrfs/ctree.c')
-rw-r--r-- | fs/btrfs/ctree.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index de6de8e60b46..02fae7f7e42c 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c | |||
@@ -951,10 +951,12 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans, | |||
951 | BUG_ON(ret); /* -ENOMEM */ | 951 | BUG_ON(ret); /* -ENOMEM */ |
952 | } | 952 | } |
953 | if (new_flags != 0) { | 953 | if (new_flags != 0) { |
954 | int level = btrfs_header_level(buf); | ||
955 | |||
954 | ret = btrfs_set_disk_extent_flags(trans, root, | 956 | ret = btrfs_set_disk_extent_flags(trans, root, |
955 | buf->start, | 957 | buf->start, |
956 | buf->len, | 958 | buf->len, |
957 | new_flags, 0); | 959 | new_flags, level, 0); |
958 | if (ret) | 960 | if (ret) |
959 | return ret; | 961 | return ret; |
960 | } | 962 | } |