d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OpenZFS 8070 - Add some ZFS comments

Browse Source 
Authored by: Alan Somers <asomers@gmail.com>
Reviewed by: Yuri Pankov <yuri.pankov@gmail.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Ported-by: bunder2015 <omfgbunder@gmail.com>

OpenZFS-issue: https://www.illumos.org/issues/8070
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/40713f2
Closes #6160
This commit is contained in:
Alan Somers 2017-05-24 06:34:56 -04:00 committed by Brian Behlendorf
parent 959f56b993
commit 0071036526
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
module/zfs/dbuf.c
View File

@ -1300,6 +1300,11 @@ dbuf_unoverride(dbuf_dirty_record_t *dr)
uint64_t txg = dr->dr_txg;
ASSERT(MUTEX_HELD(&db->db_mtx));
/*
* This assert is valid because dmu_sync() expects to be called by
* a zilog's get_data while holding a range lock. This call only
* comes from dbuf_dirty() callers who must also hold a range lock.
*/
ASSERT(dr->dt.dl.dr_override_state != DR_IN_DMU_SYNC);
ASSERT(db->db_level == 0);

2
module/zfs/dsl_scan.c
View File

@ -1511,6 +1511,7 @@ dsl_scan_active(dsl_scan_t *scn)
return (used != 0);
}
/* Called whenever a txg syncs. */
void
dsl_scan_sync(dsl_pool_t *dp, dmu_tx_t *tx)
{
@ -1956,6 +1957,7 @@ dsl_scan_scrub_cb(dsl_pool_t *dp,
return (0);
}
/* Called by the ZFS_IOC_POOL_SCAN ioctl to start a scrub or resilver */
int
dsl_scan(dsl_pool_t *dp, pool_scan_func_t func)
{