diff options
| author | dim <dim@FreeBSD.org> | 2010-10-19 21:02:05 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2010-10-19 21:02:05 +0000 |
| commit | acc1b913a3297e19f9ffe7d2b7b8a3142926d3b4 (patch) | |
| tree | 3ba42afae5a4abd129ca596650d0c27112d3953e /sys/fs/nfsclient/nfs_clnode.c | |
| parent | ba43e0ffe7a883f062e502acf73190ce6534b0fe (diff) | |
| parent | f0ce9e3f305fe6039937eade02551429beef30ac (diff) | |
| download | FreeBSD-src-acc1b913a3297e19f9ffe7d2b7b8a3142926d3b4.zip FreeBSD-src-acc1b913a3297e19f9ffe7d2b7b8a3142926d3b4.tar.gz | |
Sync: merge r213992 through r214076 from ^/head.
Diffstat (limited to 'sys/fs/nfsclient/nfs_clnode.c')
| -rw-r--r-- | sys/fs/nfsclient/nfs_clnode.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/fs/nfsclient/nfs_clnode.c b/sys/fs/nfsclient/nfs_clnode.c index 7d76be0..8ca1c43 100644 --- a/sys/fs/nfsclient/nfs_clnode.c +++ b/sys/fs/nfsclient/nfs_clnode.c @@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> +#include <sys/fcntl.h> #include <sys/lock.h> #include <sys/malloc.h> #include <sys/mount.h> @@ -53,12 +54,13 @@ __FBSDID("$FreeBSD$"); #include <fs/nfsclient/nfsmount.h> #include <fs/nfsclient/nfs.h> +#include <nfs/nfs_lock.h> + extern struct vop_vector newnfs_vnodeops; extern struct buf_ops buf_ops_newnfs; MALLOC_DECLARE(M_NEWNFSREQ); uma_zone_t newnfsnode_zone; -vop_reclaim_t *ncl_reclaim_p = NULL; void ncl_nhinit(void) @@ -238,8 +240,8 @@ ncl_reclaim(struct vop_reclaim_args *ap) * If the NLM is running, give it a chance to abort pending * locks. */ - if (ncl_reclaim_p) - ncl_reclaim_p(ap); + if (nfs_reclaim_p != NULL) + nfs_reclaim_p(ap); /* * Destroy the vm object and flush associated pages. |
