diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-04-21 14:42:15 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-04-21 14:42:15 +0800 |
| commit | fd9302c16fc244139c1ddfdffc145d5b772ed9ce (patch) | |
| tree | 40270feadd63149bcd43380cf3fe402a2dcd85ad /fs/btrfs/inode-map.h | |
| parent | 9b17ba5e21b99587d7c54250059cf10fd51c74f2 (diff) | |
| parent | 6fe78bc1bfcddabbf3d210e18f91da44fa796d8a (diff) | |
Merge remote-tracking branch 'lts/linux-4.1.y' into linux-linaro-lsk-v4.1lsk-v4.1-16.04
Conflicts:
arch/arm/include/asm/psci.h
mm/memcontrol.c
Diffstat (limited to 'fs/btrfs/inode-map.h')
| -rw-r--r-- | fs/btrfs/inode-map.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/inode-map.h b/fs/btrfs/inode-map.h index ddb347bfee23..c8e864b2d530 100644 --- a/fs/btrfs/inode-map.h +++ b/fs/btrfs/inode-map.h @@ -9,5 +9,6 @@ int btrfs_save_ino_cache(struct btrfs_root *root, struct btrfs_trans_handle *trans); int btrfs_find_free_objectid(struct btrfs_root *root, u64 *objectid); +int btrfs_find_highest_objectid(struct btrfs_root *root, u64 *objectid); #endif |