From owner-svn-src-all@FreeBSD.ORG Mon Jul 14 18:02:37 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6C046CA9; Mon, 14 Jul 2014 18:02:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3EFE4227F; Mon, 14 Jul 2014 18:02:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6EI2b9Z004065; Mon, 14 Jul 2014 18:02:37 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6EI2amd004063; Mon, 14 Jul 2014 18:02:36 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201407141802.s6EI2amd004063@svn.freebsd.org> From: Xin LI Date: Mon, 14 Jul 2014 18:02:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r268626 - in vendor-sys/illumos/dist/uts/common/fs/zfs: . sys X-SVN-Group: vendor-sys MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jul 2014 18:02:37 -0000 Author: delphij Date: Mon Jul 14 18:02:36 2014 New Revision: 268626 URL: http://svnweb.freebsd.org/changeset/base/268626 Log: 4951 ZFS administrative commands should use reserved space, not fail with ENOSPC (fix call) Approved by: Christopher Siden illumos/illumos-gate@c39f2c8cacf297ec37acd421f4c4fec127991995 Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_pool.c vendor-sys/illumos/dist/uts/common/fs/zfs/sys/spa.h Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_pool.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_pool.c Mon Jul 14 17:54:36 2014 (r268625) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_pool.c Mon Jul 14 18:02:36 2014 (r268626) @@ -612,17 +612,12 @@ dsl_pool_adjustedsize(dsl_pool_t *dp, bo uint64_t space, resv; /* - * Reserve about 1.6% (1/64), or at least 32MB, for allocation - * efficiency. - * XXX The intent log is not accounted for, so it must fit - * within this slop. - * * If we're trying to assess whether it's OK to do a free, * cut the reservation in half to allow forward progress * (e.g. make it possible to rm(1) files from a full pool). */ space = spa_get_dspace(dp->dp_spa); - resv = MAX(space >> 6, SPA_MINDEVSIZE >> 1); + resv = spa_get_slop_space(dp->dp_spa); if (netfree) resv >>= 1; Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/sys/spa.h ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/sys/spa.h Mon Jul 14 17:54:36 2014 (r268625) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/sys/spa.h Mon Jul 14 18:02:36 2014 (r268626) @@ -739,6 +739,7 @@ extern spa_load_state_t spa_load_state(s extern uint64_t spa_freeze_txg(spa_t *spa); extern uint64_t spa_get_asize(spa_t *spa, uint64_t lsize); extern uint64_t spa_get_dspace(spa_t *spa); +extern uint64_t spa_get_slop_space(spa_t *spa); extern void spa_update_dspace(spa_t *spa); extern uint64_t spa_version(spa_t *spa); extern boolean_t spa_deflate(spa_t *spa);