diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2014-02-21 18:50:29 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2014-02-21 18:50:29 +0000 |
| commit | 91eb0ae5931fc30725eef8123148f586fc2baeda (patch) | |
| tree | 22df6a2f8feeb453e3718d9ea719940c4e57695d /usr/src/lib/libshare/nfs/libshare_nfs.c | |
| parent | 26b44dd0207ce5feef85b1e6f0b5a4dbc4f60e07 (diff) | |
| parent | 97f7c4750238e3c507904468e4e9f17b15a08e2d (diff) | |
| download | illumos-joyent-91eb0ae5931fc30725eef8123148f586fc2baeda.tar.gz | |
[illumos-gate merge]
commit 97f7c4750238e3c507904468e4e9f17b15a08e2d
4600 Netbackup Catalog verification hangs waiting for NDMP server
commit 361f55a51b4e8a8d5a73478602f4afdc6e199da5
4576 mountd(1m) needs to be able to set listen backlog
commit 2c2a4b290e9cec73c81d22d42d3a63f2a3bb4e70
4519 ABI checking needs to adapt to modern times, run by default
commit cb4d1691226e6583657e84c8ca7e3835499528a0
4522 the build doesn't fail nearly often enough
commit a422476ddc8b07ee8e17a5962a46cd3b1f2ae17b
4525 remove last vestiges of tonic
commit c3e6cb59e6ec7e289cc296c8f5f6e77651afe0a2
4526 nightly contains a great deal of effectively dead code
Conflicts:
usr/src/tools/scripts/nightly.sh
usr/src/lib/libshare/nfs/libshare_nfs.c (copyright)
Diffstat (limited to 'usr/src/lib/libshare/nfs/libshare_nfs.c')
| -rw-r--r-- | usr/src/lib/libshare/nfs/libshare_nfs.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/usr/src/lib/libshare/nfs/libshare_nfs.c b/usr/src/lib/libshare/nfs/libshare_nfs.c index 3b8fddd327..ccfd7f2990 100644 --- a/usr/src/lib/libshare/nfs/libshare_nfs.c +++ b/usr/src/lib/libshare/nfs/libshare_nfs.c @@ -21,11 +21,9 @@ /* * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright 2014 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2012, Joyent, Inc. All rights reserved. */ -/* - * Copyright 2013 Nexenta Systems, Inc. All rights reserved. - */ /* * NFS specific functions @@ -2400,6 +2398,14 @@ struct proto_option_defs { {"nfsd_device", "device", PROTO_OPT_NFSD_DEVICE, OPT_TYPE_STRING, NULL, SVC_NFSD, 0, 0}, +#define PROTO_OPT_MOUNTD_LISTEN_BACKLOG 15 + {"mountd_listen_backlog", + "mountd_listen_backlog", PROTO_OPT_MOUNTD_LISTEN_BACKLOG, + OPT_TYPE_NUMBER, 64, SVC_NFSD|SVC_MOUNTD, 1, INT32_MAX}, +#define PROTO_OPT_MOUNTD_MAX_THREADS 16 + {"mountd_max_threads", + "mountd_max_threads", PROTO_OPT_MOUNTD_MAX_THREADS, + OPT_TYPE_NUMBER, 16, SVC_NFSD|SVC_MOUNTD, 1, INT32_MAX}, {NULL} }; |