Btrfs: fix readdir on 32 bit machines

[safe/jmp/linux-2.6] / fs / btrfs / volumes.h

diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
index c50e505..86c44e9 100644 (file)
--- a/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h
@@ -26,20 +26,24 @@ struct buffer_head;
 struct btrfs_device {
        struct list_head dev_list;
        struct list_head dev_alloc_list;
+       struct btrfs_fs_devices *fs_devices;
        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 writeable;
        int in_fs_metadata;
 
        spinlock_t io_lock;
 
        struct block_device *bdev;
 
+       /* the mode sent to open_bdev_exclusive */
+       fmode_t mode;
+
        char *name;
 
        /* the internal btrfs device id */
@@ -77,6 +81,8 @@ struct btrfs_fs_devices {
        u64 latest_trans;
        u64 num_devices;
        u64 open_devices;
+       u64 rw_devices;
+       u64 total_rw_bytes;
        struct block_device *latest_bdev;
        /* all of the devices in the FS */
        struct list_head devices;
@@ -84,7 +90,11 @@ struct btrfs_fs_devices {
        /* devices not currently being allocated */
        struct list_head alloc_list;
        struct list_head list;
-       int mounted;
+
+       struct btrfs_fs_devices *seed;
+       int seeding;
+
+       int opened;
 };
 
 struct btrfs_bio_stripe {
@@ -109,24 +119,25 @@ struct btrfs_multi_bio {
 int btrfs_alloc_dev_extent(struct btrfs_trans_handle *trans,
                           struct btrfs_device *device,
                           u64 chunk_tree, u64 chunk_objectid,
-                          u64 chunk_offset,
-                          u64 num_bytes, u64 *start);
+                          u64 chunk_offset, u64 start, u64 num_bytes);
 int btrfs_map_block(struct btrfs_mapping_tree *map_tree, int rw,
                    u64 logical, u64 *length,
                    struct btrfs_multi_bio **multi_ret, int mirror_num);
+int btrfs_rmap_block(struct btrfs_mapping_tree *map_tree,
+                    u64 chunk_start, u64 physical, u64 devid,
+                    u64 **logical, int *naddrs, int *stripe_len);
 int btrfs_read_sys_array(struct btrfs_root *root);
 int btrfs_read_chunk_tree(struct btrfs_root *root);
 int btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
-                     struct btrfs_root *extent_root, u64 *start,
-                     u64 *num_bytes, u64 type);
+                     struct btrfs_root *extent_root, u64 type);
 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 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,
+                      fmode_t flags, void *holder);
+int btrfs_scan_one_device(const char *path, fmode_t 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);
@@ -141,10 +152,11 @@ int btrfs_unplug_page(struct btrfs_mapping_tree *map_tree,
 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);
+                                      u8 *uuid, u8 *fsid);
 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);
+int btrfs_chunk_readonly(struct btrfs_root *root, u64 chunk_offset);
 #endif