svn commit: r325911 - stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Andriy Gapon
avg at FreeBSD.org
Thu Nov 16 22:53:37 UTC 2017
Author: avg
Date: Thu Nov 16 22:53:36 2017
New Revision: 325911
URL: https://svnweb.freebsd.org/changeset/base/325911
Log:
MFC r325608: MFV r325607: 8607 zfs: variable set but not used
Modified:
stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c Thu Nov 16 22:47:41 2017 (r325910)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c Thu Nov 16 22:53:36 2017 (r325911)
@@ -487,7 +487,6 @@ dsl_pool_create(spa_t *spa, nvlist_t *zplprops, uint64
int err;
dsl_pool_t *dp = dsl_pool_open_impl(spa, txg);
dmu_tx_t *tx = dmu_tx_create_assigned(dp, txg);
- objset_t *os;
dsl_dataset_t *ds;
uint64_t obj;
@@ -538,12 +537,15 @@ dsl_pool_create(spa_t *spa, nvlist_t *zplprops, uint64
/* create the root objset */
VERIFY0(dsl_dataset_hold_obj(dp, obj, FTAG, &ds));
- rrw_enter(&ds->ds_bp_rwlock, RW_READER, FTAG);
- os = dmu_objset_create_impl(dp->dp_spa, ds,
- dsl_dataset_get_blkptr(ds), DMU_OST_ZFS, tx);
- rrw_exit(&ds->ds_bp_rwlock, FTAG);
#ifdef _KERNEL
- zfs_create_fs(os, kcred, zplprops, tx);
+ {
+ objset_t *os;
+ rrw_enter(&ds->ds_bp_rwlock, RW_READER, FTAG);
+ os = dmu_objset_create_impl(dp->dp_spa, ds,
+ dsl_dataset_get_blkptr(ds), DMU_OST_ZFS, tx);
+ rrw_exit(&ds->ds_bp_rwlock, FTAG);
+ zfs_create_fs(os, kcred, zplprops, tx);
+ }
#endif
dsl_dataset_rele(ds, FTAG);
Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Thu Nov 16 22:47:41 2017 (r325910)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Thu Nov 16 22:53:36 2017 (r325911)
@@ -5836,10 +5836,6 @@ zfs_ioc_send_space(const char *snapname, nvlist_t *inn
dsl_dataset_t *tosnap;
int error;
char *fromname;
- /* LINTED E_FUNC_SET_NOT_USED */
- boolean_t largeblockok;
- /* LINTED E_FUNC_SET_NOT_USED */
- boolean_t embedok;
boolean_t compressok;
uint64_t space;
@@ -5853,8 +5849,6 @@ zfs_ioc_send_space(const char *snapname, nvlist_t *inn
return (error);
}
- largeblockok = nvlist_exists(innvl, "largeblockok");
- embedok = nvlist_exists(innvl, "embedok");
compressok = nvlist_exists(innvl, "compressok");
error = nvlist_lookup_string(innvl, "from", &fromname);
@@ -5895,7 +5889,9 @@ zfs_ioc_send_space(const char *snapname, nvlist_t *inn
goto out;
}
} else {
- // If estimating the size of a full send, use dmu_send_estimate
+ /*
+ * If estimating the size of a full send, use dmu_send_estimate.
+ */
error = dmu_send_estimate(tosnap, NULL, compressok, &space);
}
More information about the svn-src-stable-11
mailing list