Fix btrfs_open_devices to deal with changes since the scan ioctls

[deliverable/linux.git] / fs / btrfs / volumes.h

diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
index a2660d2b6b344a1ccfaedbc7f9e72911441f57c3..4df6b1608f91b13a54f59db973a81353ed57641f 100644 (file)
--- a/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h
@@ -27,8 +27,10 @@ struct btrfs_device {
        struct list_head dev_alloc_list;
        struct btrfs_root *dev_root;
        struct buffer_head *pending_io;
+       u64 generation;
 
        int barriers;
+       int in_fs_metadata;
 
        spinlock_t io_lock;
 
@@ -69,16 +71,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 {
@@ -90,7 +92,8 @@ struct btrfs_multi_bio {
        atomic_t stripes_pending;
        bio_end_io_t *end_io;
        void *private;
-       int error;
+       atomic_t error;
+       int max_errors;
        int num_stripes;
        struct btrfs_bio_stripe stripes[];
 };
@@ -121,11 +124,22 @@ int btrfs_open_devices(struct btrfs_fs_devices *fs_devices,
 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