diff options
author | Chris Mason <clm@fb.com> | 2015-08-09 16:35:33 +0200 |
---|---|---|
committer | Chris Mason <clm@fb.com> | 2015-08-09 16:35:33 +0200 |
commit | 46cd28555ffaa40162290dba203daad0ff6f7abd (patch) | |
tree | a10fd81b6c7ff5ea7642b1e2462e529971e8713a /fs/btrfs/ctree.h | |
parent | Btrfs: add support for blkio controllers (diff) | |
parent | btrfs: add missing discards when unpinning extents with -o discard (diff) | |
download | linux-46cd28555ffaa40162290dba203daad0ff6f7abd.tar.xz linux-46cd28555ffaa40162290dba203daad0ff6f7abd.zip |
Merge branch 'jeffm-discard-4.3' into for-linus-4.3
Diffstat (limited to 'fs/btrfs/ctree.h')
-rw-r--r-- | fs/btrfs/ctree.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index d4042c89d29b..938efe33be80 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -3431,6 +3431,8 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans, struct btrfs_root *root, u64 group_start, struct extent_map *em); void btrfs_delete_unused_bgs(struct btrfs_fs_info *fs_info); +void btrfs_get_block_group_trimming(struct btrfs_block_group_cache *cache); +void btrfs_put_block_group_trimming(struct btrfs_block_group_cache *cache); void btrfs_create_pending_block_groups(struct btrfs_trans_handle *trans, struct btrfs_root *root); u64 btrfs_get_alloc_profile(struct btrfs_root *root, int data); @@ -4067,6 +4069,7 @@ __cold void __btrfs_std_error(struct btrfs_fs_info *fs_info, const char *function, unsigned int line, int errno, const char *fmt, ...); +const char *btrfs_decode_error(int errno); __cold void __btrfs_abort_transaction(struct btrfs_trans_handle *trans, |