c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-26 11:19:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove wholedisk check from vdev_disk_open()

Browse Source 
As described by the comment and enforced the by assertion the
v->vdev_wholedisk will never be -1.  The wholedisk handling
is performed by the user space utilities.  To prevent confusion
this dead code is being removed.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
Brian Behlendorf 2013-02-26 11:28:14 -08:00
parent 0d8103d956
commit bd99a7584a
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
module/zfs/vdev_disk.c
View File

@ -294,20 +294,6 @@ skip_open:
/* Determine the physical block size */ /* Determine the physical block size */
block_size = vdev_bdev_block_size(vd->vd_bdev); block_size = vdev_bdev_block_size(vd->vd_bdev);
/* We think the wholedisk property should always be set when this
* function is called. ASSERT here so if any legitimate cases exist
* where it's not set, we'll find them during debugging. If we never
* hit the ASSERT, this and the following conditional statement can be
* removed. */
ASSERT3S(v->vdev_wholedisk, !=, -1ULL);
/* The wholedisk property was initialized to -1 in vdev_alloc() if it
* was unspecified. In that case, check if this is a whole device.
* When bdev->bd_contains == bdev we have a whole device and not simply
* a partition. */
if (v->vdev_wholedisk == -1ULL)
v->vdev_wholedisk = (bdev->bd_contains == bdev);
/* Clear the nowritecache bit, causes vdev_reopen() to try again. */ /* Clear the nowritecache bit, causes vdev_reopen() to try again. */
v->vdev_nowritecache = B_FALSE; v->vdev_nowritecache = B_FALSE;