Btrfs: Lower contention on the csum mutex

[mirror_ubuntu-artful-kernel.git] / fs / btrfs / volumes.h

diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
index a2660d2b6b344a1ccfaedbc7f9e72911441f57c3..c50e50580b51124dec6b67c110f6edef2fa0557a 100644 (file)
--- a/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h
@@ -20,6 +20,7 @@
 #define __BTRFS_VOLUMES_
 
 #include <linux/bio.h>
+#include "async-thread.h"
 
 struct buffer_head;
 struct btrfs_device {
@@ -27,15 +28,18 @@ struct btrfs_device {
        struct list_head dev_alloc_list;
        struct btrfs_root *dev_root;
        struct buffer_head *pending_io;
+       struct bio *pending_bios;
+       struct bio *pending_bio_tail;
+       int running_pending;
+       u64 generation;
 
        int barriers;
+       int in_fs_metadata;
 
        spinlock_t io_lock;
 
        struct block_device *bdev;
 
-       u64 total_ios;
-
        char *name;
 
        /* the internal btrfs device id */
@@ -61,6 +65,8 @@ struct btrfs_device {
 
        /* physical drive uuid (or lvm uuid) */
        u8 uuid[BTRFS_UUID_SIZE];
+
+       struct btrfs_work work;
 };
 
 struct btrfs_fs_devices {
@@ -69,16 +75,16 @@ struct btrfs_fs_devices {
        /* the device with this id has the most recent coyp of the super */
        u64 latest_devid;
        u64 latest_trans;
-       u64 lowest_devid;
        u64 num_devices;
+       u64 open_devices;
        struct block_device *latest_bdev;
-       struct block_device *lowest_bdev;
        /* all of the devices in the FS */
        struct list_head devices;
 
        /* devices not currently being allocated */
        struct list_head alloc_list;
        struct list_head list;
+       int mounted;
 };
 
 struct btrfs_bio_stripe {
@@ -89,8 +95,10 @@ struct btrfs_bio_stripe {
 struct btrfs_multi_bio {
        atomic_t stripes_pending;
        bio_end_io_t *end_io;
+       struct bio *orig_bio;
        void *private;
-       int error;
+       atomic_t error;
+       int max_errors;
        int num_stripes;
        struct btrfs_bio_stripe stripes[];
 };
@@ -114,18 +122,29 @@ int btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
 void btrfs_mapping_init(struct btrfs_mapping_tree *tree);
 void btrfs_mapping_tree_free(struct btrfs_mapping_tree *tree);
 int btrfs_map_bio(struct btrfs_root *root, int rw, struct bio *bio,
-                 int mirror_num);
+                 int mirror_num, int async_submit);
 int btrfs_read_super_device(struct btrfs_root *root, struct extent_buffer *buf);
 int btrfs_open_devices(struct btrfs_fs_devices *fs_devices,
                       int flags, void *holder);
 int btrfs_scan_one_device(const char *path, int flags, void *holder,
                          struct btrfs_fs_devices **fs_devices_ret);
 int btrfs_close_devices(struct btrfs_fs_devices *fs_devices);
+int btrfs_close_extra_devices(struct btrfs_fs_devices *fs_devices);
 int btrfs_add_device(struct btrfs_trans_handle *trans,
                     struct btrfs_root *root,
                     struct btrfs_device *device);
+int btrfs_rm_device(struct btrfs_root *root, char *device_path);
 int btrfs_cleanup_fs_uuids(void);
 int btrfs_num_copies(struct btrfs_mapping_tree *map_tree, u64 logical, u64 len);
 int btrfs_unplug_page(struct btrfs_mapping_tree *map_tree,
                      u64 logical, struct page *page);
+int btrfs_grow_device(struct btrfs_trans_handle *trans,
+                     struct btrfs_device *device, u64 new_size);
+struct btrfs_device *btrfs_find_device(struct btrfs_root *root, u64 devid,
+                                      u8 *uuid);
+int btrfs_shrink_device(struct btrfs_device *device, u64 new_size);
+int btrfs_init_new_device(struct btrfs_root *root, char *path);
+int btrfs_balance(struct btrfs_root *dev_root);
+void btrfs_unlock_volumes(void);
+void btrfs_lock_volumes(void);
 #endif