diff options
| author | Miao Xie <miaox@cn.fujitsu.com> | 2014-09-03 21:35:33 +0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2014-09-17 13:38:33 -0700 |
| commit | 935e5cc935bcbf9b3d0dd59fed7dbc0f2ebca6bc (patch) | |
| tree | 2489d657687317839ab01cd1c617356851839726 /fs/btrfs/volumes.h | |
| parent | 1c43366d3b3f0fa6c6e81aaf3aa18e0550245dad (diff) | |
| download | op-kernel-dev-935e5cc935bcbf9b3d0dd59fed7dbc0f2ebca6bc.zip op-kernel-dev-935e5cc935bcbf9b3d0dd59fed7dbc0f2ebca6bc.tar.gz | |
Btrfs: fix wrong disk size when writing super blocks
total_size will be changed when resizing a device, and disk_total_size
will be changed if resizing is successful. Meanwhile, the on-disk super
blocks of the previous transaction might not be updated. Considering
the consistency of the metadata in the previous transaction, We should
use the size in the previous transaction to check if the super block is
beyond the boundary of the device. Fix it.
Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/volumes.h')
| -rw-r--r-- | fs/btrfs/volumes.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h index e15f288..b30d018 100644 --- a/fs/btrfs/volumes.h +++ b/fs/btrfs/volumes.h @@ -87,6 +87,21 @@ struct btrfs_device { /* physical drive uuid (or lvm uuid) */ u8 uuid[BTRFS_UUID_SIZE]; + /* + * size of the device on the current transaction + * + * This variant is update when committing the transaction, + * and protected by device_list_mutex + */ + u64 commit_total_bytes; + + /* + * used to manage the device which is resized + * + * It is protected by chunk_lock. + */ + struct list_head resized_list; + /* for sending down flush barriers */ int nobarriers; struct bio *flush_bio; @@ -136,6 +151,7 @@ struct btrfs_fs_devices { struct mutex device_list_mutex; struct list_head devices; + struct list_head resized_devices; /* devices not currently being allocated */ struct list_head alloc_list; struct list_head list; @@ -402,4 +418,6 @@ static inline void btrfs_dev_stat_reset(struct btrfs_device *dev, { btrfs_dev_stat_set(dev, index, 0); } + +void btrfs_update_commit_device_size(struct btrfs_fs_info *fs_info); #endif |
