diff options
| author | Chris Mason <clm@fb.com> | 2015-03-25 10:52:48 -0700 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-03-25 10:52:48 -0700 |
| commit | fc4c3c872f44bf425963feba57eb9c3f8ac2d7eb (patch) | |
| tree | 0d49c3e4d8f64a4cc0d3f42f37430fc60007e28b /fs/btrfs/file.c | |
| parent | 9deed229fa8a83bb5cd713b2d2a8e5c022a4b45b (diff) | |
| parent | a4f3d2c4efe2628329249b64fd5799468e025b9d (diff) | |
| download | linux-stable-fc4c3c872f44bf425963feba57eb9c3f8ac2d7eb.tar.gz linux-stable-fc4c3c872f44bf425963feba57eb9c3f8ac2d7eb.tar.bz2 linux-stable-fc4c3c872f44bf425963feba57eb9c3f8ac2d7eb.zip | |
Merge branch 'cleanups-post-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.1
Signed-off-by: Chris Mason <clm@fb.com>
Conflicts:
fs/btrfs/disk-io.c
Diffstat (limited to 'fs/btrfs/file.c')
| -rw-r--r-- | fs/btrfs/file.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index ac26a917df7b..7d4bb3b6fbc2 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -864,7 +864,7 @@ next_slot: memcpy(&new_key, &key, sizeof(new_key)); new_key.offset = end; - btrfs_set_item_key_safe(root, path, &new_key); + btrfs_set_item_key_safe(root->fs_info, path, &new_key); extent_offset += end - key.offset; btrfs_set_file_extent_offset(leaf, fi, extent_offset); @@ -1122,7 +1122,7 @@ again: ino, bytenr, orig_offset, &other_start, &other_end)) { new_key.offset = end; - btrfs_set_item_key_safe(root, path, &new_key); + btrfs_set_item_key_safe(root->fs_info, path, &new_key); fi = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_file_extent_item); btrfs_set_file_extent_generation(leaf, fi, @@ -1156,7 +1156,7 @@ again: trans->transid); path->slots[0]++; new_key.offset = start; - btrfs_set_item_key_safe(root, path, &new_key); + btrfs_set_item_key_safe(root->fs_info, path, &new_key); fi = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_file_extent_item); @@ -2164,7 +2164,7 @@ static int fill_holes(struct btrfs_trans_handle *trans, struct inode *inode, u64 num_bytes; key.offset = offset; - btrfs_set_item_key_safe(root, path, &key); + btrfs_set_item_key_safe(root->fs_info, path, &key); fi = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_file_extent_item); num_bytes = btrfs_file_extent_num_bytes(leaf, fi) + end - |