diff options
| author | Chris Mason <chris.mason@oracle.com> | 2012-01-16 21:26:17 +0100 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2012-01-16 21:26:17 +0100 |
| commit | d756bd2d9339447c29bde950910586df8f8941ec (patch) | |
| tree | f96aeb682bcc4fdcf75d080f260c809b9fbc4a1a /fs/btrfs/volumes.h | |
| parent | Merge branch 'restriper' of git://github.com/idryomov/btrfs-unstable into int... (diff) | |
| parent | Btrfs: fix possible deadlock when opening a seed device (diff) | |
| download | linux-d756bd2d9339447c29bde950910586df8f8941ec.tar.xz linux-d756bd2d9339447c29bde950910586df8f8941ec.zip | |
Merge branch 'for-chris' of git://repo.or.cz/linux-btrfs-devel into integration
Conflicts:
fs/btrfs/volumes.c
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/volumes.h')
| -rw-r--r-- | fs/btrfs/volumes.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h index 6faec9dd1f93..19ac95048b88 100644 --- a/fs/btrfs/volumes.h +++ b/fs/btrfs/volumes.h @@ -279,7 +279,6 @@ int btrfs_recover_balance(struct btrfs_root *tree_root); int btrfs_pause_balance(struct btrfs_fs_info *fs_info); int btrfs_cancel_balance(struct btrfs_fs_info *fs_info); int btrfs_chunk_readonly(struct btrfs_root *root, u64 chunk_offset); -int find_free_dev_extent(struct btrfs_trans_handle *trans, - struct btrfs_device *device, u64 num_bytes, +int find_free_dev_extent(struct btrfs_device *device, u64 num_bytes, u64 *start, u64 *max_avail); #endif |