diff options
| author | avg <avg@FreeBSD.org> | 2017-10-04 07:43:04 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2017-10-04 07:43:04 +0000 |
| commit | 7dabf7165ce0478b645a42fb52c19554750ef6f2 (patch) | |
| tree | 5aa3e8c8e37ea504409a2a44e6324db677861e96 /cddl/contrib/opensolaris/cmd | |
| parent | 4dd3087fce1dcac3a4a31ac14113c4368173ded2 (diff) | |
| download | FreeBSD-src-7dabf7165ce0478b645a42fb52c19554750ef6f2.zip FreeBSD-src-7dabf7165ce0478b645a42fb52c19554750ef6f2.tar.gz | |
MFC r323791: MFV r323790: 8567 Inconsistent return value in zpool_read_label
Diffstat (limited to 'cddl/contrib/opensolaris/cmd')
| -rw-r--r-- | cddl/contrib/opensolaris/cmd/zpool/zpool_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c index 572265f..409bd24 100644 --- a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c +++ b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c @@ -705,7 +705,7 @@ zpool_do_labelclear(int argc, char **argv) return (1); } - if (zpool_read_label(fd, &config) != 0 || config == NULL) { + if (zpool_read_label(fd, &config) != 0) { (void) fprintf(stderr, gettext("failed to read label from %s\n"), vdev); return (1); |
