diff options
author | rmacklem <rmacklem@FreeBSD.org> | 2014-08-01 21:10:41 +0000 |
---|---|---|
committer | rmacklem <rmacklem@FreeBSD.org> | 2014-08-01 21:10:41 +0000 |
commit | 50867d802b534350d2bee81cf0858b8cd871b487 (patch) | |
tree | 7ce81fe06c3c67164e672e40de7e128c98669a0c /sys/fs/nfsserver/nfs_nfsdcache.c | |
parent | ba879dc5f5950146f01bba4a949fe57cdd5628a2 (diff) | |
download | FreeBSD-src-50867d802b534350d2bee81cf0858b8cd871b487.zip FreeBSD-src-50867d802b534350d2bee81cf0858b8cd871b487.tar.gz |
MFC: r268115
Merge the NFSv4.1 server code in projects/nfsv4.1-server over
into head. The code is not believed to have any effect
on the semantics of non-NFSv4.1 server behaviour.
It is a rather large merge, but I am hoping that there will
not be any regressions for the NFS server.
Diffstat (limited to 'sys/fs/nfsserver/nfs_nfsdcache.c')
-rw-r--r-- | sys/fs/nfsserver/nfs_nfsdcache.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sys/fs/nfsserver/nfs_nfsdcache.c b/sys/fs/nfsserver/nfs_nfsdcache.c index 2c4a654..0f78b3f 100644 --- a/sys/fs/nfsserver/nfs_nfsdcache.c +++ b/sys/fs/nfsserver/nfs_nfsdcache.c @@ -977,6 +977,9 @@ nfsrvd_refcache(struct nfsrvcache *rp) { struct mtx *mutex; + if (rp == NULL) + /* For NFSv4.1, there is no cache entry. */ + return; mutex = nfsrc_cachemutex(rp); mtx_lock(mutex); if (rp->rc_refcnt < 0) |