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

Sort by full path name instead of by GUID when importing

Browse Source 
Preferentially sort by the full path name instead of GUID when determining
which device links to use.  This helps ensure that the pool vdevs are named
consistently when multiple links for a device appear in the same directory.
For example, the /dev/disk/by-id/scsi* and /dev/disk/by-id/wwn* links.

Reviewed-by: Alek Pinchuk <apinchuk@datto.com>
Reviewed-by: Richard Elling <Richard.Elling@RichardElling.com>
Authored-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Kash Pande <kash@tripleback.net>
Closes #8108 
Closes #8440
This commit is contained in:
kpande 2019-02-26 11:13:15 -08:00 committed by Brian Behlendorf
parent e065034563
commit 47d7ef5490
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libzutil/zutil_import.c
View File

@ -1458,7 +1458,7 @@ typedef struct rdsk_node {
} rdsk_node_t; } rdsk_node_t;
/* /*
* Sorted by vdev guid and full path to allow for multiple entries with * Sorted by full path and then vdev guid to allow for multiple entries with
* the same full path name. This is required because it's possible to * the same full path name. This is required because it's possible to
* have multiple block devices with labels that refer to the same * have multiple block devices with labels that refer to the same
* ZPOOL_CONFIG_PATH yet have different vdev guids. In this case both * ZPOOL_CONFIG_PATH yet have different vdev guids. In this case both
@ -1475,11 +1475,11 @@ slice_cache_compare(const void *arg1, const void *arg2)
uint64_t guid2 = ((rdsk_node_t *)arg2)->rn_vdev_guid; uint64_t guid2 = ((rdsk_node_t *)arg2)->rn_vdev_guid;
int rv; int rv;
rv = AVL_CMP(guid1, guid2); rv = AVL_ISIGN(strcmp(nm1, nm2));
if (rv) if (rv)
return (rv); return (rv);
return (AVL_ISIGN(strcmp(nm1, nm2))); return (AVL_CMP(guid1, guid2));
} }
static boolean_t static boolean_t