diff options
| author | avg <avg@FreeBSD.org> | 2013-04-03 11:06:26 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2013-04-03 11:06:26 +0000 |
| commit | c8fe315d98b07175c5fb3029236d99caf89a5eff (patch) | |
| tree | f5b8df4d8041eba7d3cafc307c16849e76189a72 /sys/cddl | |
| parent | e9e96300b70118a02c9983e18a85baa40bbdd515 (diff) | |
| download | FreeBSD-src-c8fe315d98b07175c5fb3029236d99caf89a5eff.zip FreeBSD-src-c8fe315d98b07175c5fb3029236d99caf89a5eff.tar.gz | |
spa_open_common: fix argument to zvol_create_minors
Prior to r248571 spa_open was always called with a bare pool name,
but now it is called with a dataset name instead (spa_lookup handles
that).
So, when a ZFS root is mounted spa_open is called with a name of a root
dataset, which can very well be different from the pool name.
But zvol_create_minors should be called with the pool name, because it
performs a recursive traversal of all datasets under the name to find
all those that are volumes.
MFC after: 7 days
Diffstat (limited to 'sys/cddl')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c index 61629d2..880b18f 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c @@ -2885,7 +2885,7 @@ spa_open_common(const char *pool, spa_t **spapp, void *tag, nvlist_t *nvpolicy, #ifdef __FreeBSD__ #ifdef _KERNEL if (firstopen) - zvol_create_minors(pool); + zvol_create_minors(spa->spa_name); #endif #endif } |
