diff options
Diffstat (limited to 'fs/btrfs/volumes.h')
| -rw-r--r-- | fs/btrfs/volumes.h | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h index 8b3cd14..b72f540 100644 --- a/fs/btrfs/volumes.h +++ b/fs/btrfs/volumes.h @@ -43,8 +43,9 @@ struct btrfs_device { /* WRITE_SYNC bios */ struct btrfs_pending_bios pending_sync_bios; - u64 generation; int running_pending; + u64 generation; + int writeable; int in_fs_metadata; int missing; @@ -52,11 +53,11 @@ struct btrfs_device { int is_tgtdev_for_dev_replace; spinlock_t io_lock; - /* the mode sent to blkdev_get */ - fmode_t mode; struct block_device *bdev; + /* the mode sent to blkdev_get */ + fmode_t mode; struct rcu_string *name; @@ -77,21 +78,16 @@ struct btrfs_device { /* optimal io width for this device */ u32 io_width; - /* type and info about this device */ - u64 type; /* minimal io size for this device */ u32 sector_size; + /* type and info about this device */ + u64 type; /* physical drive uuid (or lvm uuid) */ u8 uuid[BTRFS_UUID_SIZE]; - /* for sending down flush barriers */ - int nobarriers; - struct bio *flush_bio; - struct completion flush_wait; - /* per-device scrub information */ struct scrub_ctx *scrub_device; @@ -107,6 +103,10 @@ struct btrfs_device { struct radix_tree_root reada_zones; struct radix_tree_root reada_extents; + /* for sending down flush barriers */ + struct bio *flush_bio; + struct completion flush_wait; + int nobarriers; /* disk I/O failure stats. For detailed description refer to * enum btrfs_dev_stat_values in ioctl.h */ @@ -132,9 +132,7 @@ struct btrfs_fs_devices { /* all of the devices in the FS, protected by a mutex * so we can safely walk it to write out the supers without - * worrying about add/remove by the multi-device code. - * Scrubbing super can kick off supers writing by holding - * this mutex lock. + * worrying about add/remove by the multi-device code */ struct mutex device_list_mutex; struct list_head devices; |