diff options
| author | Chris Mason | 2016-07-26 22:07:05 +0200 |
|---|---|---|
| committer | Chris Mason | 2016-07-26 22:07:05 +0200 |
| commit | 023a824f04754a4ed5efc16ee8e41bb932878b0b (patch) | |
| tree | 8ae0bc5a61945bdec42d6c7a929967c548031d5d /fs/btrfs/free-space-cache.c | |
| parent | Btrfs: fix delalloc accounting after copy_from_user faults (diff) | |
| parent | btrfs: btrfs_abort_transaction, drop root parameter (diff) | |
| download | kernel-qcow2-linux-023a824f04754a4ed5efc16ee8e41bb932878b0b.tar.gz kernel-qcow2-linux-023a824f04754a4ed5efc16ee8e41bb932878b0b.tar.xz kernel-qcow2-linux-023a824f04754a4ed5efc16ee8e41bb932878b0b.zip | |
Merge branch 'kdave-v4.8' into for-linus-4.8
Diffstat (limited to 'fs/btrfs/free-space-cache.c')
| -rw-r--r-- | fs/btrfs/free-space-cache.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c index 69d270f6602c..d571bd2b697b 100644 --- a/fs/btrfs/free-space-cache.c +++ b/fs/btrfs/free-space-cache.c @@ -280,7 +280,7 @@ fail: if (locked) mutex_unlock(&trans->transaction->cache_write_mutex); if (ret) - btrfs_abort_transaction(trans, root, ret); + btrfs_abort_transaction(trans, ret); return ret; } @@ -3026,7 +3026,7 @@ int btrfs_find_space_cluster(struct btrfs_root *root, * For metadata, allow allocates with smaller extents. For * data, keep it dense. */ - if (btrfs_test_opt(root, SSD_SPREAD)) { + if (btrfs_test_opt(root->fs_info, SSD_SPREAD)) { cont1_bytes = min_bytes = bytes + empty_size; } else if (block_group->flags & BTRFS_BLOCK_GROUP_METADATA) { cont1_bytes = bytes; @@ -3470,7 +3470,7 @@ int load_free_ino_cache(struct btrfs_fs_info *fs_info, struct btrfs_root *root) int ret = 0; u64 root_gen = btrfs_root_generation(&root->root_item); - if (!btrfs_test_opt(root, INODE_MAP_CACHE)) + if (!btrfs_test_opt(root->fs_info, INODE_MAP_CACHE)) return 0; /* @@ -3514,7 +3514,7 @@ int btrfs_write_out_ino_cache(struct btrfs_root *root, struct btrfs_io_ctl io_ctl; bool release_metadata = true; - if (!btrfs_test_opt(root, INODE_MAP_CACHE)) + if (!btrfs_test_opt(root->fs_info, INODE_MAP_CACHE)) return 0; memset(&io_ctl, 0, sizeof(io_ctl)); |