MFV r331708:
9321 arc_loan_compressed_buf() can increment arc_loaned_bytes by the wrong value illumos/illumos-gate@9be12bd737 arc_loan_compressed_buf() increments arc_loaned_bytes by psize unconditionally In the case of zfs_compressed_arc_enabled=0, when the buf is returned via arc_return_buf(), if ARC_BUF_COMPRESSED(buf) is false, then arc_loaned_bytes is decremented by lsize, not psize. Switch to using arc_buf_size(buf), instead of psize, which will return psize or lsize, depending on the result of ARC_BUF_COMPRESSED(buf). Reviewed by: Matt Ahrens <matt@delphix.com> Reviewed by: George Wilson <george.wilson@delphix.com> Approved by: Garrett D'Amore <garrett@damore.org> Author: Allan Jude <allanjude@freebsd.org>
This commit is contained in:
commit
9311abdd7e
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=331709
@ -2877,7 +2877,7 @@ arc_loan_buf(spa_t *spa, boolean_t is_metadata, int size)
|
||||
arc_buf_t *buf = arc_alloc_buf(spa, arc_onloan_tag,
|
||||
is_metadata ? ARC_BUFC_METADATA : ARC_BUFC_DATA, size);
|
||||
|
||||
arc_loaned_bytes_update(size);
|
||||
arc_loaned_bytes_update(arc_buf_size(buf));
|
||||
|
||||
return (buf);
|
||||
}
|
||||
@ -2889,7 +2889,7 @@ arc_loan_compressed_buf(spa_t *spa, uint64_t psize, uint64_t lsize,
|
||||
arc_buf_t *buf = arc_alloc_compressed_buf(spa, arc_onloan_tag,
|
||||
psize, lsize, compression_type);
|
||||
|
||||
arc_loaned_bytes_update(psize);
|
||||
arc_loaned_bytes_update(arc_buf_size(buf));
|
||||
|
||||
return (buf);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user