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

Commit 0253f40e authored by jeff.liu's avatar jeff.liu Committed by Josef Bacik
Browse files

Btrfs: Remove the invalid shrink size check up from btrfs_shrink_dev() 



Remove an invalid size check up from btrfs_shrink_dev().

The new size should not larger than the device->total_bytes as it was
already verified before coming to here(i.e. new_size < old_size).

Remove invalid check up for btrfs_shrink_dev().

Signed-off-by: default avatarJie Liu <jeff.liu@oracle.com>
Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parent 9afab882

fs/btrfs/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -1409,7 +1409,7 @@ static noinline int btrfs_ioctl_resize(struct btrfs_root *root, 
		btrfs_commit_transaction(trans, root);

	} else if (new_size < old_size) {

		ret = btrfs_shrink_device(device, new_size);

	}

	} /* equal, nothing need to do */



out_free:

	kfree(vol_args);

fs/btrfs/volumes.c

+0 −3
Original line number Diff line number Diff line
@@ -3059,9 +3059,6 @@ int btrfs_shrink_device(struct btrfs_device *device, u64 new_size) 
	u64 old_size = device->total_bytes;

	u64 diff = device->total_bytes - new_size;



	if (new_size >= device->total_bytes)

		return -EINVAL;



	path = btrfs_alloc_path();

	if (!path)

		return -ENOMEM;