diff options
Diffstat (limited to 'fs/btrfs/backref.c')
| -rw-r--r-- | fs/btrfs/backref.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c index a1efd39ca28a..54a201dac7f9 100644 --- a/fs/btrfs/backref.c +++ b/fs/btrfs/backref.c | |||
| @@ -276,9 +276,8 @@ static int add_all_parents(struct btrfs_root *root, struct btrfs_path *path, | |||
| 276 | } | 276 | } |
| 277 | if (ret > 0) | 277 | if (ret > 0) |
| 278 | goto next; | 278 | goto next; |
| 279 | ret = ulist_add_merge(parents, eb->start, | 279 | ret = ulist_add_merge_ptr(parents, eb->start, |
| 280 | (uintptr_t)eie, | 280 | eie, (void **)&old, GFP_NOFS); |
| 281 | (u64 *)&old, GFP_NOFS); | ||
| 282 | if (ret < 0) | 281 | if (ret < 0) |
| 283 | break; | 282 | break; |
| 284 | if (!ret && extent_item_pos) { | 283 | if (!ret && extent_item_pos) { |
| @@ -1011,9 +1010,9 @@ again: | |||
| 1011 | goto out; | 1010 | goto out; |
| 1012 | ref->inode_list = eie; | 1011 | ref->inode_list = eie; |
| 1013 | } | 1012 | } |
| 1014 | ret = ulist_add_merge(refs, ref->parent, | 1013 | ret = ulist_add_merge_ptr(refs, ref->parent, |
| 1015 | (uintptr_t)ref->inode_list, | 1014 | ref->inode_list, |
| 1016 | (u64 *)&eie, GFP_NOFS); | 1015 | (void **)&eie, GFP_NOFS); |
| 1017 | if (ret < 0) | 1016 | if (ret < 0) |
| 1018 | goto out; | 1017 | goto out; |
| 1019 | if (!ret && extent_item_pos) { | 1018 | if (!ret && extent_item_pos) { |