Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

dsl_dir_tempreserve_impl: remove unused `deferred` variable 

The following commit moved the users of `deferred` into function
dsl_pool_unreserved_space:

    commit d2734cce68
    Author: Serapheim Dimitropoulos <serapheim.dimitro@delphix.com>
    Date:   Fri Dec 16 14:11:29 2016 -0800

        OpenZFS 9166 - zfs storage pool checkpoint

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Ryan Moeller <freqlabs@FreeBSD.org>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Signed-off-by: Christian Schwarz <christian.schwarz@nutanix.com>
Closes #13056
This commit is contained in:
Christian Schwarz 2022-02-04 19:33:34 +01:00 committed by Tony Hutter
parent 765be36006
commit a61915e086
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
module/zfs/dsl_dir.c
View File

@ -1320,7 +1320,6 @@ top_of_function:
* we're very close to full, this will allow a steady trickle of * we're very close to full, this will allow a steady trickle of
* removes to get through. * removes to get through.
*/ */
uint64_t deferred = 0;
if (dd->dd_parent == NULL) { if (dd->dd_parent == NULL) {
uint64_t avail = dsl_pool_unreserved_space(dd->dd_pool, uint64_t avail = dsl_pool_unreserved_space(dd->dd_pool,
(netfree) ? (netfree) ?
@ -1340,7 +1339,7 @@ top_of_function:
*/ */
if (used_on_disk + est_inflight >= quota) { if (used_on_disk + est_inflight >= quota) {
if (est_inflight > 0 || used_on_disk < quota || if (est_inflight > 0 || used_on_disk < quota ||
(retval == ENOSPC && used_on_disk < quota + deferred)) (retval == ENOSPC && used_on_disk < quota))
retval = ERESTART; retval = ERESTART;
dprintf_dd(dd, "failing: used=%lluK inflight = %lluK " dprintf_dd(dd, "failing: used=%lluK inflight = %lluK "
"quota=%lluK tr=%lluK err=%d\n", "quota=%lluK tr=%lluK err=%d\n",