Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 935e5cc9 authored by Miao Xie's avatar Miao Xie Committed by Chris Mason
Browse files

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: default avatarMiao Xie <miaox@cn.fujitsu.com>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent 1c43366d

fs/btrfs/check-integrity.c

+1 −1
Original line number Diff line number Diff line
@@ -807,7 +807,7 @@ static int btrfsic_process_superblock_dev_mirror( 


	/* super block bytenr is always the unmapped device bytenr */

	dev_bytenr = btrfs_sb_offset(superblock_mirror_num);

	if (dev_bytenr + BTRFS_SUPER_INFO_SIZE > device->total_bytes)

	if (dev_bytenr + BTRFS_SUPER_INFO_SIZE > device->commit_total_bytes)

		return -1;

	bh = __bread(superblock_bdev, dev_bytenr / 4096,

		     BTRFS_SUPER_INFO_SIZE);

fs/btrfs/dev-replace.c

+18 −0
Original line number Diff line number Diff line
@@ -168,6 +168,8 @@ int btrfs_init_dev_replace(struct btrfs_fs_info *fs_info) 
					dev_replace->srcdev->total_bytes;

				dev_replace->tgtdev->disk_total_bytes =

					dev_replace->srcdev->disk_total_bytes;

				dev_replace->tgtdev->commit_total_bytes =

					dev_replace->srcdev->commit_total_bytes;

				dev_replace->tgtdev->bytes_used =

					dev_replace->srcdev->bytes_used;

			}
@@ -329,6 +331,20 @@ int btrfs_dev_replace_start(struct btrfs_root *root, 
	    args->start.tgtdev_name[0] == '\0')

		return -EINVAL;



	/*

	 * Here we commit the transaction to make sure commit_total_bytes

	 * of all the devices are updated.

	 */

	trans = btrfs_attach_transaction(root);

	if (!IS_ERR(trans)) {

		ret = btrfs_commit_transaction(trans, root);

		if (ret)

			return ret;

	} else if (PTR_ERR(trans) != -ENOENT) {

		return PTR_ERR(trans);

	}



	/* the disk copy procedure reuses the scrub code */

	mutex_lock(&fs_info->volume_mutex);

	ret = btrfs_dev_replace_find_srcdev(root, args->start.srcdevid,

					    args->start.srcdev_name,
@@ -539,6 +555,8 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, 
	memcpy(src_device->uuid, uuid_tmp, sizeof(src_device->uuid));

	tgt_device->total_bytes = src_device->total_bytes;

	tgt_device->disk_total_bytes = src_device->disk_total_bytes;

	ASSERT(list_empty(&src_device->resized_list));

	tgt_device->commit_total_bytes = src_device->commit_total_bytes;

	tgt_device->bytes_used = src_device->bytes_used;

	if (fs_info->sb->s_bdev == src_device->bdev)

		fs_info->sb->s_bdev = tgt_device->bdev;

fs/btrfs/disk-io.c

+3 −2
Original line number Diff line number Diff line
@@ -3127,7 +3127,8 @@ static int write_dev_supers(struct btrfs_device *device, 


	for (i = 0; i < max_mirrors; i++) {

		bytenr = btrfs_sb_offset(i);

		if (bytenr + BTRFS_SUPER_INFO_SIZE >= device->total_bytes)

		if (bytenr + BTRFS_SUPER_INFO_SIZE >=

		    device->commit_total_bytes)

			break;



		if (wait) {
@@ -3444,7 +3445,7 @@ static int write_all_supers(struct btrfs_root *root, int max_mirrors) 
		btrfs_set_stack_device_type(dev_item, dev->type);

		btrfs_set_stack_device_id(dev_item, dev->devid);

		btrfs_set_stack_device_total_bytes(dev_item,

						   dev->disk_total_bytes);

						   dev->commit_total_bytes);

		btrfs_set_stack_device_bytes_used(dev_item, dev->bytes_used);

		btrfs_set_stack_device_io_align(dev_item, dev->io_align);

		btrfs_set_stack_device_io_width(dev_item, dev->io_width);

fs/btrfs/scrub.c

+2 −1
Original line number Diff line number Diff line
@@ -2840,7 +2840,8 @@ static noinline_for_stack int scrub_supers(struct scrub_ctx *sctx, 


	for (i = 0; i < BTRFS_SUPER_MIRROR_MAX; i++) {

		bytenr = btrfs_sb_offset(i);

		if (bytenr + BTRFS_SUPER_INFO_SIZE > scrub_dev->total_bytes)

		if (bytenr + BTRFS_SUPER_INFO_SIZE >

		    scrub_dev->commit_total_bytes)

			break;



		ret = scrub_pages(sctx, bytenr, BTRFS_SUPER_INFO_SIZE, bytenr,

fs/btrfs/transaction.c

+2 −0
Original line number Diff line number Diff line
@@ -1868,6 +1868,8 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans, 
	memcpy(root->fs_info->super_for_commit, root->fs_info->super_copy,

	       sizeof(*root->fs_info->super_copy));



	btrfs_update_commit_device_size(root->fs_info);



	spin_lock(&root->fs_info->trans_lock);

	cur_trans->state = TRANS_STATE_UNBLOCKED;

	root->fs_info->running_transaction = NULL;