Author: smh
Date: Thu Mar 14 10:06:46 2019
New Revision: 345129
URL: https://svnweb.freebsd.org/changeset/base/345129
Log:
Revert zfsimpl.c accidentally committed in r345128
Revert an unrelated change to zfsimpl.c accidentally committed in r345128.
Sponsored by: Multiplay
Modified:
stable/12/stand/libsa/zfs/zfsimpl.c
Modified: stable/12/stand/libsa/zfs/zfsimpl.c
==============================================================================
--- stable/12/stand/libsa/zfs/zfsimpl.c Thu Mar 14 10:03:04 2019
(r345128)
+++ stable/12/stand/libsa/zfs/zfsimpl.c Thu Mar 14 10:06:46 2019
(r345129)
@@ -2076,7 +2076,6 @@ zfs_mount_dataset(const spa_t *spa, uint64_t objnum, o
{
dnode_phys_t dataset;
dsl_dataset_phys_t *ds;
- int err;
if (objset_get_dnode(spa, &spa->spa_mos, objnum, &dataset)) {
printf("ZFS: can't find dataset %ju\n", (uintmax_t)objnum);
@@ -2084,9 +2083,9 @@ zfs_mount_dataset(const spa_t *spa, uint64_t objnum, o
}
ds = (dsl_dataset_phys_t *) &dataset.dn_bonus;
- if ((err = zio_read(spa, &ds->ds_bp, objset)) != 0) {
- printf("ZFS: can't read object set for dataset %ju (error
%d)\n",
- (uintmax_t)objnum, err);
+ if (zio_read(spa, &ds->ds_bp, objset)) {
+ printf("ZFS: can't read object set for dataset %ju\n",
+ (uintmax_t)objnum);
return (EIO);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
