mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-24 03:08:51 +03:00
Illumos #3464
3464 zfs synctask code needs restructuring Reviewed by: Dan Kimmel <dan.kimmel@delphix.com> Reviewed by: Adam Leventhal <ahl@delphix.com> Reviewed by: George Wilson <george.wilson@delphix.com> Reviewed by: Christopher Siden <christopher.siden@delphix.com> Approved by: Garrett D'Amore <garrett@damore.org> References: https://www.illumos.org/issues/3464 illumos/illumos-gate@3b2aab1880 Ported-by: Tim Chase <tim@chase2k.com> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes #1495
This commit is contained in:
committed by
Brian Behlendorf
parent
6f1ffb0665
commit
13fe019870
+5
-5
@@ -1643,12 +1643,12 @@ arc_buf_free(arc_buf_t *buf, void *tag)
|
||||
}
|
||||
}
|
||||
|
||||
int
|
||||
boolean_t
|
||||
arc_buf_remove_ref(arc_buf_t *buf, void* tag)
|
||||
{
|
||||
arc_buf_hdr_t *hdr = buf->b_hdr;
|
||||
kmutex_t *hash_lock = NULL;
|
||||
int no_callback = (buf->b_efunc == NULL);
|
||||
boolean_t no_callback = (buf->b_efunc == NULL);
|
||||
|
||||
if (hdr->b_state == arc_anon) {
|
||||
ASSERT(hdr->b_datacnt == 1);
|
||||
@@ -1854,7 +1854,7 @@ arc_evict(arc_state_t *state, uint64_t spa, int64_t bytes, boolean_t recycle,
|
||||
ARCSTAT_INCR(arcstat_mutex_miss, missed);
|
||||
|
||||
/*
|
||||
* We have just evicted some date into the ghost state, make
|
||||
* We have just evicted some data into the ghost state, make
|
||||
* sure we also adjust the ghost state size if necessary.
|
||||
*/
|
||||
if (arc_no_grow &&
|
||||
@@ -2772,7 +2772,7 @@ arc_bcopy_func(zio_t *zio, arc_buf_t *buf, void *arg)
|
||||
{
|
||||
if (zio == NULL || zio->io_error == 0)
|
||||
bcopy(buf->b_data, arg, buf->b_hdr->b_size);
|
||||
VERIFY(arc_buf_remove_ref(buf, arg) == 1);
|
||||
VERIFY(arc_buf_remove_ref(buf, arg));
|
||||
}
|
||||
|
||||
/* a generic arc_done_func_t */
|
||||
@@ -2781,7 +2781,7 @@ arc_getbuf_func(zio_t *zio, arc_buf_t *buf, void *arg)
|
||||
{
|
||||
arc_buf_t **bufp = arg;
|
||||
if (zio && zio->io_error) {
|
||||
VERIFY(arc_buf_remove_ref(buf, arg) == 1);
|
||||
VERIFY(arc_buf_remove_ref(buf, arg));
|
||||
*bufp = NULL;
|
||||
} else {
|
||||
*bufp = buf;
|
||||
|
||||
Reference in New Issue
Block a user