diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-09-18 11:32:34 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-09-18 11:32:34 +0000 |
| commit | 18dd2b9673f53eb496b30698f998b87209d6e45f (patch) | |
| tree | add9e7a6b7d5cf373718b4e8def087f8464e4a8a /usr/src/cmd/fs.d | |
| parent | 09443b7960ae0f0a3ddcf56d1879e006c2790316 (diff) | |
| parent | ed992b0aac4e5b70dc1273b1d055c0d471fbb4b1 (diff) | |
| download | illumos-joyent-18dd2b9673f53eb496b30698f998b87209d6e45f.tar.gz | |
[illumos-gate merge]
commit ed992b0aac4e5b70dc1273b1d055c0d471fbb4b1
8604 Avoid unnecessary work search in VFS when unmounting snapshots
commit 5f39f884e2035d671ec02148fc4d8420c670bcb4
8605 zfs channel programs: zfs.exists undocumented and non-working
commit 2bcb5458541cc6e8bf7dc541303da29297b82e8b
8602 remove unused "dp_early_sync_tasks" field from "dsl_pool" structure
commit c861bfbd77c4ae780a0341e9cb6926d8b74341cf
8567 Inconsistent return value in zpool_read_label
commit a141dbd6230b88bf7da3b673ca0f9b46918d5684
8655 remove more gender specific language
commit 30acb30daf662150e9e016113303bd74f2379dfc
8626 make pcplusmp and apix warning-free
Conflicts:
usr/src/uts/i86pc/io/pcplusmp/apic_introp.c
usr/src/uts/i86pc/io/mp_platform_misc.c
Diffstat (limited to 'usr/src/cmd/fs.d')
| -rw-r--r-- | usr/src/cmd/fs.d/zfs/fstyp/fstyp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/usr/src/cmd/fs.d/zfs/fstyp/fstyp.c b/usr/src/cmd/fs.d/zfs/fstyp/fstyp.c index 53bfda70c5..30f86375e7 100644 --- a/usr/src/cmd/fs.d/zfs/fstyp/fstyp.c +++ b/usr/src/cmd/fs.d/zfs/fstyp/fstyp.c @@ -89,8 +89,7 @@ fstyp_mod_ident(fstyp_mod_handle_t handle) uint64_t u64; char buf[64]; - if (zpool_read_label(h->fd, &h->config) != 0 || - h->config == NULL) { + if (zpool_read_label(h->fd, &h->config) != 0) { return (FSTYP_ERR_NO_MATCH); } |