diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2014-07-11 16:59:03 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2014-07-11 16:59:03 +0000 |
| commit | 5c9c69ecbe77572e7ad4ac8c151432fea25887dd (patch) | |
| tree | 03f00b6b6209e0d2a85f834fa3f032046786c0a5 /usr/src | |
| parent | 96b000be305ff5a49450f741779fd65289982904 (diff) | |
| parent | 961519c5bffd5ec670890fc3596d6c4ff1cefea0 (diff) | |
| download | illumos-joyent-5c9c69ecbe77572e7ad4ac8c151432fea25887dd.tar.gz | |
[illumos-gate merge]
commit 961519c5bffd5ec670890fc3596d6c4ff1cefea0
4990 mountd and rpcbind should use libumem(3lib)
commit c39f2c8cacf297ec37acd421f4c4fec127991995
4951 ZFS administrative commands should use reserved space, not fail with ENOSPC (fix call)
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/fs.d/nfs/mountd/Makefile | 3 | ||||
| -rw-r--r-- | usr/src/cmd/rpcbind/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/uts/common/fs/zfs/dsl_pool.c | 7 | ||||
| -rw-r--r-- | usr/src/uts/common/fs/zfs/sys/spa.h | 1 |
4 files changed, 6 insertions, 9 deletions
diff --git a/usr/src/cmd/fs.d/nfs/mountd/Makefile b/usr/src/cmd/fs.d/nfs/mountd/Makefile index f71a8b4816..50b6d21ae0 100644 --- a/usr/src/cmd/fs.d/nfs/mountd/Makefile +++ b/usr/src/cmd/fs.d/nfs/mountd/Makefile @@ -20,6 +20,7 @@ # # # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2014 Nexenta Systems, Inc. All rights reserved. # FSTYPE = nfs @@ -36,7 +37,7 @@ SRCS = $(LOCAL:%.o=%.c) $(FSLIBSRC) ../lib/nfs_sec.c \ ../lib/sharetab.c ../lib/daemon.c ../lib/smfcfg.c DSRC = mountd_dt.d DOBJ = $(DSRC:%.d=%.o) -LDLIBS += -lrpcsvc -lnsl -lbsm -lsocket -ltsnet -ltsol -lnvpair -lscf +LDLIBS += -lrpcsvc -lnsl -lbsm -lsocket -ltsnet -ltsol -lnvpair -lscf -lumem CPPFLAGS += -D_REENTRANT -I../lib CERRWARN += -_gcc=-Wno-implicit-function-declaration diff --git a/usr/src/cmd/rpcbind/Makefile b/usr/src/cmd/rpcbind/Makefile index 8b6ffae587..96d640bc1c 100644 --- a/usr/src/cmd/rpcbind/Makefile +++ b/usr/src/cmd/rpcbind/Makefile @@ -22,7 +22,7 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# Copyright 2013 Nexenta Systems, Inc. All rights reserved. +# Copyright 2014 Nexenta Systems, Inc. All rights reserved. # PROG= rpcbind @@ -44,7 +44,7 @@ ROOTMANIFESTDIR= $(ROOTSVCNETWORKRPC) CPPFLAGS= -I. -DPORTMAP $(CPPFLAGS.master) CPPFLAGS += -D_REENTRANT $(RELEASE_BUILD)CPPFLAGS += -DNDEBUG -LDLIBS += -lsocket -lnsl -lwrap -lscf +LDLIBS += -lsocket -lnsl -lwrap -lscf -lumem .KEEP_STATE: diff --git a/usr/src/uts/common/fs/zfs/dsl_pool.c b/usr/src/uts/common/fs/zfs/dsl_pool.c index 73a6cd271f..5aef3977b4 100644 --- a/usr/src/uts/common/fs/zfs/dsl_pool.c +++ b/usr/src/uts/common/fs/zfs/dsl_pool.c @@ -612,17 +612,12 @@ dsl_pool_adjustedsize(dsl_pool_t *dp, boolean_t netfree) 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; diff --git a/usr/src/uts/common/fs/zfs/sys/spa.h b/usr/src/uts/common/fs/zfs/sys/spa.h index a2f200e493..36b6c93bde 100644 --- a/usr/src/uts/common/fs/zfs/sys/spa.h +++ b/usr/src/uts/common/fs/zfs/sys/spa.h @@ -739,6 +739,7 @@ extern spa_load_state_t spa_load_state(spa_t *spa); 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); |