Skip to content

Commit 177e007

Browse files
datacore-rrajamanickamdatacore-rrajamanickam
authored
Merge pull request #87 from DataCoreSoftware/SSV-22529
SSV-22529: Downstream openzfs commits
2 parents bed9775 + 7e767e6 commit 177e007

File tree

27 files changed

+82
-45
lines changed

27 files changed

+82
-45
lines changed

‎CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
The [OpenZFS Code of Conduct](http://www.open-zfs.org/wiki/Code_of_Conduct)
1+
The [OpenZFS Code of Conduct](https://openzfs.org/wiki/Code_of_Conduct)
22
applies to spaces associated with the OpenZFS project, including GitHub.

‎cmd/zdb/zdb.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2824,9 +2824,11 @@ dump_bookmarks(objset_t *os, int verbosity)
28242824
zap_cursor_advance(&zc)) {
28252825
char osname[ZFS_MAX_DATASET_NAME_LEN];
28262826
char buf[ZFS_MAX_DATASET_NAME_LEN];
2827+
int len;
28272828
dmu_objset_name(os, osname);
2828-
VERIFY3S(0, <=, snprintf(buf, sizeof (buf), "%s#%s", osname,
2829-
attr.za_name));
2829+
len = snprintf(buf, sizeof (buf), "%s#%s", osname,
2830+
attr.za_name);
2831+
VERIFY3S(len, <, ZFS_MAX_DATASET_NAME_LEN);
28302832
(void) dump_bookmark(dp, buf, verbosity >= 5, verbosity >= 6);
28312833
}
28322834
zap_cursor_fini(&zc);
@@ -3455,9 +3457,9 @@ dump_object(objset_t *os, uint64_t object, int verbosity,
34553457
zdb_nicenum(doi.doi_physical_blocks_512 << 9, asize, sizeof (asize));
34563458
zdb_nicenum(doi.doi_bonus_size, bonus_size, sizeof (bonus_size));
34573459
zdb_nicenum(doi.doi_dnodesize, dnsize, sizeof (dnsize));
3458-
(void) sprintf(fill, "%6.2f", 100.0 * doi.doi_fill_count *
3459-
doi.doi_data_block_size / (object == 0 ? DNODES_PER_BLOCK : 1) /
3460-
doi.doi_max_offset);
3460+
(void) snprintf(fill, sizeof (fill), "%6.2f", 100.0 *
3461+
doi.doi_fill_count * doi.doi_data_block_size / (object == 0 ?
3462+
DNODES_PER_BLOCK : 1) / doi.doi_max_offset);
34613463

34623464
aux[0] = '\0';
34633465

‎cmd/zfs/zfs_main.c

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5966,8 +5966,8 @@ construct_fsacl_list(boolean_t un, struct allow_opts *opts, nvlist_t **nvlp)
59665966
if (p != NULL)
59675967
rid = p->pw_uid;
59685968
else if (*endch != '\0') {
5969-
(void) snprintf(errbuf, 256, gettext(
5970-
"invalid user %s\n"), curr);
5969+
(void) snprintf(errbuf, sizeof (errbuf),
5970+
gettext("invalid user %s\n"), curr);
59715971
allow_usage(un, B_TRUE, errbuf);
59725972
}
59735973
} else if (opts->group) {
@@ -5980,8 +5980,9 @@ construct_fsacl_list(boolean_t un, struct allow_opts *opts, nvlist_t **nvlp)
59805980
if (g != NULL)
59815981
rid = g->gr_gid;
59825982
else if (*endch != '\0') {
5983-
(void) snprintf(errbuf, 256, gettext(
5984-
"invalid group %s\n"), curr);
5983+
(void) snprintf(errbuf, sizeof (errbuf),
5984+
gettext("invalid group %s\n"),
5985+
curr);
59855986
allow_usage(un, B_TRUE, errbuf);
59865987
}
59875988
} else {
@@ -6006,8 +6007,9 @@ construct_fsacl_list(boolean_t un, struct allow_opts *opts, nvlist_t **nvlp)
60066007
who_type = ZFS_DELEG_GROUP;
60076008
rid = g->gr_gid;
60086009
} else {
6009-
(void) snprintf(errbuf, 256, gettext(
6010-
"invalid user/group %s\n"), curr);
6010+
(void) snprintf(errbuf, sizeof (errbuf),
6011+
gettext("invalid user/group %s\n"),
6012+
curr);
60116013
allow_usage(un, B_TRUE, errbuf);
60126014
}
60136015
}
@@ -8525,7 +8527,7 @@ static int
85258527
zfs_do_wait(int argc, char **argv)
85268528
{
85278529
boolean_t enabled[ZFS_WAIT_NUM_ACTIVITIES];
8528-
int error, i;
8530+
int error = 0, i;
85298531
int c;
85308532

85318533
/* By default, wait for all types of activity. */

‎cmd/zpool/zpool_main.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5360,7 +5360,13 @@ print_zpool_dir_scripts(char *dirpath)
53605360
if ((dir = opendir(dirpath)) != NULL) {
53615361
/* print all the files and directories within directory */
53625362
while ((ent = readdir(dir)) != NULL) {
5363-
sprintf(fullpath, "%s/%s", dirpath, ent->d_name);
5363+
if (snprintf(fullpath, sizeof (fullpath), "%s/%s",
5364+
dirpath, ent->d_name) >= sizeof (fullpath)) {
5365+
(void) fprintf(stderr,
5366+
gettext("internal error: "
5367+
"ZPOOL_SCRIPTS_PATH too large.\n"));
5368+
exit(1);
5369+
}
53645370

53655371
/* Print the scripts */
53665372
if (stat(fullpath, &dir_stat) == 0)

‎cmd/ztest/ztest.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4616,8 +4616,11 @@ ztest_dmu_object_alloc_free(ztest_ds_t *zd, uint64_t id)
46164616
* Destroy the previous batch of objects, create a new batch,
46174617
* and do some I/O on the new objects.
46184618
*/
4619-
if (ztest_object_init(zd, od, size, B_TRUE) != 0)
4619+
if (ztest_object_init(zd, od, size, B_TRUE) != 0) {
4620+
zd->zd_od = NULL;
4621+
umem_free(od, size);
46204622
return;
4623+
}
46214624

46224625
while (ztest_random(4 * batchsize) != 0)
46234626
ztest_io(zd, od[ztest_random(batchsize)].od_object,

‎contrib/initramfs/scripts/zfs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ clone_snap()
504504
echo "Error: $ZFS_ERROR"
505505
echo ""
506506
echo "Failed to clone snapshot."
507-
echo "Make sure that the any problems are corrected and then make sure"
507+
echo "Make sure that any problems are corrected and then make sure"
508508
echo "that the dataset '$destfs' exists and is bootable."
509509
shell
510510
else

‎include/os/linux/spl/sys/mutex.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ spl_mutex_lockdep_on_maybe(kmutex_t *mp) \
172172
*/
173173
#define mutex_exit(mp) \
174174
{ \
175+
ASSERT3P(mutex_owner(mp), ==, current); \
175176
spl_mutex_clear_owner(mp); \
176177
spin_lock(&(mp)->m_lock); \
177178
spl_mutex_lockdep_off_maybe(mp); \

‎include/sys/dsl_dir.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ struct dsl_dir {
115115
/* gross estimate of space used by in-flight tx's */
116116
uint64_t dd_tempreserved[TXG_SIZE];
117117
/* amount of space we expect to write; == amount of dirty data */
118-
int64_t dd_space_towrite[TXG_SIZE];
118+
uint64_t dd_space_towrite[TXG_SIZE];
119119

120120
dsl_deadlist_t dd_livelist;
121121
bplist_t dd_pending_frees;

‎include/sys/spa.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -663,6 +663,7 @@ _NOTE(CONSTCOND) } while (0)
663663
(u_longlong_t)DVA_GET_ASIZE(dva), \
664664
ws); \
665665
} \
666+
ASSERT3S(copies, >, 0); \
666667
if (BP_IS_ENCRYPTED(bp)) { \
667668
len += func(buf + len, size - len, \
668669
"salt=%llx iv=%llx:%llx%c", \

‎lib/libzutil/zutil_import.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -480,19 +480,18 @@ get_configs(libpc_handle_t *hdl, pool_list_t *pl, boolean_t active_ok,
480480
uint64_t guid;
481481
uint_t children = 0;
482482
nvlist_t **child = NULL;
483-
uint_t holes;
484483
uint64_t *hole_array, max_id;
485484
uint_t c;
486485
boolean_t isactive;
487-
uint64_t hostid;
488486
nvlist_t *nvl;
489487
boolean_t valid_top_config = B_FALSE;
490488

491489
if (nvlist_alloc(&ret, 0, 0) != 0)
492490
goto nomem;
493491

494492
for (pe = pl->pools; pe != NULL; pe = pe->pe_next) {
495-
uint64_t id, max_txg = 0;
493+
uint64_t id, max_txg = 0, hostid = 0;
494+
uint_t holes = 0;
496495

497496
if (nvlist_alloc(&config, NV_UNIQUE_NAME, 0) != 0)
498497
goto nomem;

‎module/icp/algs/modes/ccm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -661,7 +661,7 @@ ccm_format_initial_blocks(uchar_t *nonce, ulong_t nonceSize,
661661
bzero(&(b0[1+nonceSize]), q);
662662

663663
payloadSize = aes_ctx->ccm_data_len;
664-
limit = 8 < q ? 8 : q;
664+
limit = MIN(8, q);
665665

666666
for (i = 0, j = 0, k = 15; i < limit; i++, j += 8, k--) {
667667
b0[k] = (uint8_t)((payloadSize >> j) & 0xFF);

‎module/icp/algs/modes/modes.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,10 @@ crypto_get_ptrs(crypto_data_t *out, void **iov_or_mp, offset_t *current_offset,
106106
} else {
107107
/* one block spans two iovecs */
108108
*out_data_1_len = iov_len - offset;
109-
if (vec_idx == zfs_uio_iovcnt(uio))
109+
if (vec_idx == zfs_uio_iovcnt(uio)) {
110+
*out_data_2 = NULL;
110111
return;
112+
}
111113
vec_idx++;
112114
zfs_uio_iov_at_index(uio, vec_idx, &iov_base, &iov_len);
113115
*out_data_2 = (uint8_t *)iov_base;

‎module/nvpair/nvpair.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2034,8 +2034,11 @@ nvlist_lookup_nvpair_ei_sep(nvlist_t *nvl, const char *name, const char sep,
20342034
nvl = EMBEDDED_NVL(nvp);
20352035
break;
20362036
} else if (nvpair_type(nvp) == DATA_TYPE_NVLIST_ARRAY) {
2037-
(void) nvpair_value_nvlist_array(nvp,
2038-
&nva, (uint_t *)&n);
2037+
if (nvpair_value_nvlist_array(nvp,
2038+
&nva, (uint_t *)&n) != 0)
2039+
goto fail;
2040+
if (nva == NULL)
2041+
goto fail;
20392042
if ((n < 0) || (idx >= n))
20402043
goto fail;
20412044
nvl = nva[idx];

‎module/os/freebsd/zfs/zfs_vfsops.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,8 @@ zfs_get_temporary_prop(dsl_dataset_t *ds, zfs_prop_t zfs_prop, uint64_t *val,
218218

219219
vfs_unbusy(vfsp);
220220
if (tmp != *val) {
221-
(void) strcpy(setpoint, "temporary");
221+
if (setpoint)
222+
(void) strcpy(setpoint, "temporary");
222223
*val = tmp;
223224
}
224225
return (0);

‎module/os/linux/zfs/zfs_vfsops.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,8 @@ zfs_get_temporary_prop(dsl_dataset_t *ds, zfs_prop_t zfs_prop, uint64_t *val,
607607
}
608608

609609
if (tmp != *val) {
610-
(void) strcpy(setpoint, "temporary");
610+
if (setpoint)
611+
(void) strcpy(setpoint, "temporary");
611612
*val = tmp;
612613
}
613614
return (0);

‎module/zfs/bpobj.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -829,6 +829,7 @@ bpobj_enqueue(bpobj_t *bpo, const blkptr_t *bp, boolean_t bp_freed,
829829
dmu_buf_rele(bpo->bpo_cached_dbuf, bpo);
830830
VERIFY3U(0, ==, dmu_buf_hold(bpo->bpo_os, bpo->bpo_object,
831831
offset, bpo, &bpo->bpo_cached_dbuf, 0));
832+
ASSERT3P(bpo->bpo_cached_dbuf, !=, NULL);
832833
}
833834

834835
dmu_buf_will_dirty(bpo->bpo_cached_dbuf, tx);

‎module/zfs/dbuf.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1074,7 +1074,7 @@ dbuf_verify(dmu_buf_impl_t *db)
10741074
if ((db->db_blkptr == NULL || BP_IS_HOLE(db->db_blkptr)) &&
10751075
(db->db_buf == NULL || db->db_buf->b_data) &&
10761076
db->db.db_data && db->db_blkid != DMU_BONUS_BLKID &&
1077-
db->db_state != DB_FILL && !dn->dn_free_txg) {
1077+
db->db_state != DB_FILL && (dn == NULL || !dn->dn_free_txg)) {
10781078
/*
10791079
* If the blkptr isn't set but they have nonzero data,
10801080
* it had better be dirty, otherwise we'll lose that
@@ -3136,6 +3136,7 @@ dbuf_dnode_findbp(dnode_t *dn, uint64_t level, uint64_t blkid,
31363136

31373137
err = dbuf_findbp(dn, level, blkid, B_FALSE, &dbp, &bp2);
31383138
if (err == 0) {
3139+
ASSERT3P(bp2, !=, NULL);
31393140
*bp = *bp2;
31403141
if (dbp != NULL)
31413142
dbuf_rele(dbp, NULL);
@@ -3274,10 +3275,10 @@ dbuf_prefetch_indirect_done(zio_t *zio, const zbookmark_phys_t *zb,
32743275
blkptr_t *bp = ((blkptr_t *)abuf->b_data) +
32753276
P2PHASE(nextblkid, 1ULL << dpa->dpa_epbs);
32763277

3277-
ASSERT(!BP_IS_REDACTED(bp) ||
3278+
ASSERT(!BP_IS_REDACTED(bp) || (dpa->dpa_dnode &&
32783279
dsl_dataset_feature_is_active(
32793280
dpa->dpa_dnode->dn_objset->os_dsl_dataset,
3280-
SPA_FEATURE_REDACTED_DATASETS));
3281+
SPA_FEATURE_REDACTED_DATASETS)));
32813282
if (BP_IS_HOLE(bp) || BP_IS_REDACTED(bp)) {
32823283
dbuf_prefetch_fini(dpa, B_TRUE);
32833284
} else if (dpa->dpa_curlevel == dpa->dpa_zb.zb_level) {
@@ -3573,8 +3574,10 @@ dbuf_hold_impl(dnode_t *dn, uint8_t level, uint64_t blkid,
35733574
dn->dn_object != DMU_META_DNODE_OBJECT &&
35743575
db->db_state == DB_CACHED && db->db_data_pending) {
35753576
dbuf_dirty_record_t *dr = db->db_data_pending;
3576-
if (dr->dt.dl.dr_data == db->db_buf)
3577+
if (dr->dt.dl.dr_data == db->db_buf) {
3578+
ASSERT3P(db->db_buf, !=, NULL);
35773579
dbuf_hold_copy(dn, db);
3580+
}
35783581
}
35793582

35803583
if (multilist_link_active(&db->db_cache_link)) {
@@ -4393,7 +4396,6 @@ dbuf_sync_leaf(dbuf_dirty_record_t *dr, dmu_tx_t *tx)
43934396
while (dr->dt.dl.dr_override_state == DR_IN_DMU_SYNC) {
43944397
ASSERT(dn->dn_object != DMU_META_DNODE_OBJECT);
43954398
cv_wait(&db->db_changed, &db->db_mtx);
4396-
ASSERT(dr->dt.dl.dr_override_state != DR_NOT_OVERRIDDEN);
43974399
}
43984400

43994401
/*

‎module/zfs/dmu_objset.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,12 +1093,14 @@ dmu_objset_create_impl_dnstats(spa_t *spa, dsl_dataset_t *ds, blkptr_t *bp,
10931093
(!os->os_encrypted || !dmu_objset_is_receiving(os))) {
10941094
os->os_phys->os_flags |= OBJSET_FLAG_USERACCOUNTING_COMPLETE;
10951095
if (dmu_objset_userobjused_enabled(os)) {
1096+
ASSERT3P(ds, !=, NULL);
10961097
ds->ds_feature_activation[
10971098
SPA_FEATURE_USEROBJ_ACCOUNTING] = (void *)B_TRUE;
10981099
os->os_phys->os_flags |=
10991100
OBJSET_FLAG_USEROBJACCOUNTING_COMPLETE;
11001101
}
11011102
if (dmu_objset_projectquota_enabled(os)) {
1103+
ASSERT3P(ds, !=, NULL);
11021104
ds->ds_feature_activation[
11031105
SPA_FEATURE_PROJECT_QUOTA] = (void *)B_TRUE;
11041106
os->os_phys->os_flags |=

‎module/zfs/dmu_recv.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1138,7 +1138,7 @@ dmu_recv_begin(char *tofs, char *tosnap, dmu_replay_record_t *drr_begin,
11381138
zfs_file_t *fp, offset_t *voffp)
11391139
{
11401140
dmu_recv_begin_arg_t drba = { 0 };
1141-
int err;
1141+
int err = 0;
11421142

11431143
bzero(drc, sizeof (dmu_recv_cookie_t));
11441144
drc->drc_drr_begin = drr_begin;
@@ -1249,11 +1249,11 @@ receive_read(dmu_recv_cookie_t *drc, int len, void *buf)
12491249
(drc->drc_featureflags & DMU_BACKUP_FEATURE_RAW) != 0);
12501250

12511251
while (done < len) {
1252-
ssize_t resid;
1252+
ssize_t resid = len - done;
12531253
zfs_file_t *fp = drc->drc_fp;
12541254
int err = zfs_file_read(fp, (char *)buf + done,
12551255
len - done, &resid);
1256-
if (resid == len - done) {
1256+
if (err == 0 && resid == len - done) {
12571257
/*
12581258
* Note: ECKSUM or ZFS_ERR_STREAM_TRUNCATED indicates
12591259
* that the receive was interrupted and can
@@ -1931,7 +1931,7 @@ flush_write_batch_impl(struct receive_writer_arg *rwa)
19311931
if (err == 0)
19321932
abd_free(abd);
19331933
} else {
1934-
zio_prop_t zp;
1934+
zio_prop_t zp = {0};
19351935
dmu_write_policy(rwa->os, dn, 0, 0, &zp);
19361936

19371937
enum zio_flag zio_flags = 0;

‎module/zfs/dmu_send.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1701,8 +1701,10 @@ enqueue_range(struct send_reader_thread_arg *srta, bqueue_t *q, dnode_t *dn,
17011701
struct send_range *range = range_alloc(range_type, dn->dn_object,
17021702
blkid, blkid + count, B_FALSE);
17031703

1704-
if (blkid == DMU_SPILL_BLKID)
1704+
if (blkid == DMU_SPILL_BLKID) {
1705+
ASSERT3P(bp, !=, NULL);
17051706
ASSERT3U(BP_GET_TYPE(bp), ==, DMU_OT_SA);
1707+
}
17061708

17071709
switch (range_type) {
17081710
case HOLE:
@@ -1823,8 +1825,7 @@ send_reader_thread(void *arg)
18231825
continue;
18241826
}
18251827
uint64_t file_max =
1826-
(dn->dn_maxblkid < range->end_blkid ?
1827-
dn->dn_maxblkid : range->end_blkid);
1828+
MIN(dn->dn_maxblkid, range->end_blkid);
18281829
/*
18291830
* The object exists, so we need to try to find the
18301831
* blkptr for each block in the range we're processing.

‎module/zfs/dsl_dir.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,10 +1194,9 @@ dsl_dir_space_towrite(dsl_dir_t *dd)
11941194

11951195
ASSERT(MUTEX_HELD(&dd->dd_lock));
11961196

1197-
for (int i = 0; i < TXG_SIZE; i++) {
1197+
for (int i = 0; i < TXG_SIZE; i++)
11981198
space += dd->dd_space_towrite[i & TXG_MASK];
1199-
ASSERT3U(dd->dd_space_towrite[i & TXG_MASK], >=, 0);
1200-
}
1199+
12011200
return (space);
12021201
}
12031202

@@ -2071,6 +2070,8 @@ dsl_dir_rename_sync(void *arg, dmu_tx_t *tx)
20712070
VERIFY0(dsl_dir_hold(dp, ddra->ddra_newname, FTAG, &newparent,
20722071
&mynewname));
20732072

2073+
ASSERT3P(mynewname, !=, NULL);
2074+
20742075
/* Log this before we change the name. */
20752076
spa_history_log_internal_dd(dd, "rename", tx,
20762077
"-> %s", ddra->ddra_newname);

‎module/zfs/sa.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1202,6 +1202,7 @@ sa_attr_iter(objset_t *os, sa_hdr_phys_t *hdr, dmu_object_type_t type,
12021202
uint8_t idx_len;
12031203

12041204
reg_length = sa->sa_attr_table[tb->lot_attrs[i]].sa_length;
1205+
IMPLY(reg_length == 0, IS_SA_BONUSTYPE(type));
12051206
if (reg_length) {
12061207
attr_length = reg_length;
12071208
idx_len = 0;

‎module/zfs/vdev.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5252,9 +5252,13 @@ vdev_split(vdev_t *vd)
52525252
{
52535253
vdev_t *cvd, *pvd = vd->vdev_parent;
52545254

5255+
VERIFY3U(pvd->vdev_children, >, 1);
5256+
52555257
vdev_remove_child(pvd, vd);
52565258
vdev_compact_children(pvd);
52575259

5260+
ASSERT3P(pvd->vdev_child, !=, NULL);
5261+
52585262
cvd = pvd->vdev_child[0];
52595263
if (pvd->vdev_children == 1) {
52605264
vdev_remove_parent(cvd);

‎module/zfs/vdev_queue.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -725,6 +725,7 @@ vdev_queue_aggregate(vdev_queue_t *vq, zio_t *zio)
725725
* after our span is mandatory.
726726
*/
727727
dio = AVL_NEXT(t, last);
728+
ASSERT3P(dio, !=, NULL);
728729
dio->io_flags &= ~ZIO_FLAG_OPTIONAL;
729730
} else {
730731
/* do not include the optional i/o */

0 commit comments

Comments
 (0)