diff options
| author | Siddheshwar Mahesh <Siddheshwar.Mahesh@Sun.COM> | 2009-06-05 15:01:56 -0500 |
|---|---|---|
| committer | Siddheshwar Mahesh <Siddheshwar.Mahesh@Sun.COM> | 2009-06-05 15:01:56 -0500 |
| commit | ed629aef897f4494e9359e52811ca81d4b278489 (patch) | |
| tree | f8a9e6a89bd374c422956352dbd610d9df1b01f7 /usr/src/cmd | |
| parent | b25e2337574c465b86a1b0cc0dbc78f14aa4eb03 (diff) | |
| download | illumos-joyent-ed629aef897f4494e9359e52811ca81d4b278489.tar.gz | |
6844040 NFSv2 WRITEs over RDMA fail to unregister data buffers
6845259 nfsd should honor the '-p proto' and '-t provider'options
6197327 Client mounts should fail gracefully when RDMA is disabled
Diffstat (limited to 'usr/src/cmd')
| -rw-r--r-- | usr/src/cmd/fs.d/nfs/nfsd/nfsd.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/usr/src/cmd/fs.d/nfs/nfsd/nfsd.c b/usr/src/cmd/fs.d/nfs/nfsd/nfsd.c index 9c86d18a54..e786d5d868 100644 --- a/usr/src/cmd/fs.d/nfs/nfsd/nfsd.c +++ b/usr/src/cmd/fs.d/nfs/nfsd/nfsd.c @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -39,8 +39,6 @@ /* LINTLIBRARY */ /* PROTOLIB1 */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* NFS server */ #include <sys/param.h> @@ -497,11 +495,15 @@ main(int ac, char *av[]) * destructor thread. * * start rdma services and block in the kernel. + * (only if proto or provider is not set to TCP or UDP) */ - if (svcrdma(NFS_SVCPOOL_ID, nfs_server_vers_min, nfs_server_vers_max, - nfs_server_delegation)) { - fprintf(stderr, "Can't set up RDMA creator thread : %s", - strerror(errno)); + if ((proto == NULL) && (provider == NULL)) { + if (svcrdma(NFS_SVCPOOL_ID, nfs_server_vers_min, + nfs_server_vers_max, nfs_server_delegation)) { + fprintf(stderr, + "Can't set up RDMA creator thread : %s", + strerror(errno)); + } } /* |