diff options
| author | Konstantin Belousov <kib@FreeBSD.org> | 2010-06-13 05:24:27 +0000 |
|---|---|---|
| committer | Konstantin Belousov <kib@FreeBSD.org> | 2010-06-13 05:24:27 +0000 |
| commit | b38f7723eb3cc04e8ea170413a746af9a230ecc5 (patch) | |
| tree | 1577a85dd66937c640490d5a03b9962a2385299f /sys/fs/nfsserver/nfs_nfsdsocket.c | |
| parent | 5ad333cf624a9aa3792118cf16c3f6d5aaf8f5ee (diff) | |
| download | src-b38f7723eb3cc04e8ea170413a746af9a230ecc5.tar.gz src-b38f7723eb3cc04e8ea170413a746af9a230ecc5.zip | |
In NFS clients, instead of inconsistently using #ifdef
DIAGNOSTIC and #ifndef DIAGNOSTIC for debug assertions, prefer
KASSERT(). Also change one #ifdef DIAGNOSTIC in the new nfs server.
Submitted by: Mikolaj Golub <to.my.trociny gmail com>
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=209120
Diffstat (limited to 'sys/fs/nfsserver/nfs_nfsdsocket.c')
| -rw-r--r-- | sys/fs/nfsserver/nfs_nfsdsocket.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/fs/nfsserver/nfs_nfsdsocket.c b/sys/fs/nfsserver/nfs_nfsdsocket.c index fc6e39e63cfd..c95fef22a46a 100644 --- a/sys/fs/nfsserver/nfs_nfsdsocket.c +++ b/sys/fs/nfsserver/nfs_nfsdsocket.c @@ -364,10 +364,7 @@ nfsrvd_dorpc(struct nfsrv_descript *nd, int isdgram, * Get a locked vnode for the first file handle */ if (!(nd->nd_flag & ND_NFSV4)) { -#ifdef DIAGNOSTIC - if (nd->nd_repstat) - panic("nfsrvd_dorpc"); -#endif + KASSERT(nd->nd_repstat == 0, ("nfsrvd_dorpc")); /* * For NFSv3, if the malloc/mget allocation is near limits, * return NFSERR_DELAY. |