diff options
| author | kib <kib@FreeBSD.org> | 2010-06-13 05:24:27 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2010-06-13 05:24:27 +0000 |
| commit | 9100139edc3976c40b4dd05903c61be5c5fc333d (patch) | |
| tree | 1577a85dd66937c640490d5a03b9962a2385299f /sys/fs/nfsclient/nfs_clsubs.c | |
| parent | 82a6368b8628b24215cb22de6039e60e2fad7aff (diff) | |
| download | FreeBSD-src-9100139edc3976c40b4dd05903c61be5c5fc333d.zip FreeBSD-src-9100139edc3976c40b4dd05903c61be5c5fc333d.tar.gz | |
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
Diffstat (limited to 'sys/fs/nfsclient/nfs_clsubs.c')
| -rw-r--r-- | sys/fs/nfsclient/nfs_clsubs.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sys/fs/nfsclient/nfs_clsubs.c b/sys/fs/nfsclient/nfs_clsubs.c index 1443278..2863ffd 100644 --- a/sys/fs/nfsclient/nfs_clsubs.c +++ b/sys/fs/nfsclient/nfs_clsubs.c @@ -282,10 +282,7 @@ ncl_getcookie(struct nfsnode *np, off_t off, int add) pos = (uoff_t)off / NFS_DIRBLKSIZ; if (pos == 0 || off < 0) { -#ifdef DIAGNOSTIC - if (add) - panic("nfs getcookie add at <= 0"); -#endif + KASSERT(!add, ("nfs getcookie add at <= 0")); return (&nfs_nullcookie); } pos--; @@ -336,10 +333,7 @@ ncl_invaldir(struct vnode *vp) { struct nfsnode *np = VTONFS(vp); -#ifdef DIAGNOSTIC - if (vp->v_type != VDIR) - panic("nfs: invaldir not dir"); -#endif + KASSERT(vp->v_type == VDIR, ("nfs: invaldir not dir")); ncl_dircookie_lock(np); np->n_direofoffset = 0; np->n_cookieverf.nfsuquad[0] = 0; |
