diff options
| author | Chris Mason <chris.mason@fusionio.com> | 2013-02-20 14:06:05 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2013-02-20 14:06:05 -0500 |
| commit | e942f883bc6651d50be139477baf6fb0eed3d5bb (patch) | |
| tree | e1d19783e9c8b42198a69c17c9719fb90f302847 /fs/btrfs/volumes.h | |
| parent | b2c6b3e0611c58fbeb6b9c0892b6249f7bdfaf6b (diff) | |
| parent | 0e4e02636611dbf89a2f36320a32054f9936d6cb (diff) | |
| download | op-kernel-dev-e942f883bc6651d50be139477baf6fb0eed3d5bb.zip op-kernel-dev-e942f883bc6651d50be139477baf6fb0eed3d5bb.tar.gz | |
Merge branch 'raid56-experimental' into for-linus-3.9
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Conflicts:
fs/btrfs/ctree.h
fs/btrfs/extent-tree.c
fs/btrfs/inode.c
fs/btrfs/volumes.c
Diffstat (limited to 'fs/btrfs/volumes.h')
| -rw-r--r-- | fs/btrfs/volumes.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h index 12bb841..062d860 100644 --- a/fs/btrfs/volumes.h +++ b/fs/btrfs/volumes.h @@ -321,7 +321,14 @@ void btrfs_destroy_dev_replace_tgtdev(struct btrfs_fs_info *fs_info, void btrfs_init_dev_replace_tgtdev_for_resume(struct btrfs_fs_info *fs_info, struct btrfs_device *tgtdev); int btrfs_scratch_superblock(struct btrfs_device *device); - +void btrfs_schedule_bio(struct btrfs_root *root, + struct btrfs_device *device, + int rw, struct bio *bio); +int btrfs_is_parity_mirror(struct btrfs_mapping_tree *map_tree, + u64 logical, u64 len, int mirror_num); +unsigned long btrfs_full_stripe_len(struct btrfs_root *root, + struct btrfs_mapping_tree *map_tree, + u64 logical); static inline void btrfs_dev_stat_inc(struct btrfs_device *dev, int index) { |
