diff options
| author | Chris Mason <chris.mason@oracle.com> | 2009-09-24 10:00:58 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2009-09-24 10:00:58 -0400 |
| commit | 54bcf382daf08c1396edb8b81e650b58930ccaef (patch) | |
| tree | 64b941f09489b5c9ee63e4ad43d736bfce911b21 /fs/btrfs/volumes.h | |
| parent | 94a8d5caba74211ec76dac80fc6e2d5c391530df (diff) | |
| parent | c65ddb52dc412c9b67681b1aa16cd1bac8434e24 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable into for-linus
Conflicts:
fs/btrfs/super.c
Diffstat (limited to 'fs/btrfs/volumes.h')
| -rw-r--r-- | fs/btrfs/volumes.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h index 5139a833f721..31b0fabdd2ea 100644 --- a/fs/btrfs/volumes.h +++ b/fs/btrfs/volumes.h | |||
| @@ -181,4 +181,7 @@ int btrfs_balance(struct btrfs_root *dev_root); | |||
| 181 | void btrfs_unlock_volumes(void); | 181 | void btrfs_unlock_volumes(void); |
| 182 | void btrfs_lock_volumes(void); | 182 | void btrfs_lock_volumes(void); |
| 183 | int btrfs_chunk_readonly(struct btrfs_root *root, u64 chunk_offset); | 183 | int btrfs_chunk_readonly(struct btrfs_root *root, u64 chunk_offset); |
| 184 | int find_free_dev_extent(struct btrfs_trans_handle *trans, | ||
| 185 | struct btrfs_device *device, u64 num_bytes, | ||
| 186 | u64 *start, u64 *max_avail); | ||
| 184 | #endif | 187 | #endif |