diff options
author | 2015-03-25 10:52:48 -0700 | |
---|---|---|
committer | 2015-03-25 10:52:48 -0700 | |
commit | fc4c3c872f44bf425963feba57eb9c3f8ac2d7eb (patch) | |
tree | 0d49c3e4d8f64a4cc0d3f42f37430fc60007e28b /fs/btrfs/file-item.c | |
parent | Merge branch 'cleanups-for-4.1-v2' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
parent | btrfs: cleanup, reduce temporary variables in btrfs_read_roots (diff) | |
download | linux-fc4c3c872f44bf425963feba57eb9c3f8ac2d7eb.tar.gz linux-fc4c3c872f44bf425963feba57eb9c3f8ac2d7eb.tar.bz2 linux-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-item.c')
-rw-r--r-- | fs/btrfs/file-item.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c index 3a4a7924fa38..58ece6558430 100644 --- a/fs/btrfs/file-item.c +++ b/fs/btrfs/file-item.c @@ -553,7 +553,7 @@ static noinline void truncate_one_csum(struct btrfs_root *root, btrfs_truncate_item(root, path, new_size, 0); key->offset = end_byte; - btrfs_set_item_key_safe(root, path, key); + btrfs_set_item_key_safe(root->fs_info, path, key); } else { BUG(); } |