diff options
| author | rmacklem <rmacklem@FreeBSD.org> | 2010-01-28 16:17:24 +0000 |
|---|---|---|
| committer | rmacklem <rmacklem@FreeBSD.org> | 2010-01-28 16:17:24 +0000 |
| commit | c20e37e81a2006a8ecfc2b09616eb4fe8e21d1d9 (patch) | |
| tree | 67521d5fa4256ede09d0fd00c384fb6a29538050 /sys/fs/nfsclient/nfs_clsubs.c | |
| parent | b007106a58ad04020b7f9b2729dcc01605de6452 (diff) | |
| download | FreeBSD-src-c20e37e81a2006a8ecfc2b09616eb4fe8e21d1d9.zip FreeBSD-src-c20e37e81a2006a8ecfc2b09616eb4fe8e21d1d9.tar.gz | |
Patch the experimental NFS client in a manner analogous to
r203072 for the regular NFS client. Also, delete two fields
of struct nfsmount that are not used by the FreeBSD port of
the client.
MFC after: 2 weeks
Diffstat (limited to 'sys/fs/nfsclient/nfs_clsubs.c')
| -rw-r--r-- | sys/fs/nfsclient/nfs_clsubs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/fs/nfsclient/nfs_clsubs.c b/sys/fs/nfsclient/nfs_clsubs.c index 3cd7e5c..1553509 100644 --- a/sys/fs/nfsclient/nfs_clsubs.c +++ b/sys/fs/nfsclient/nfs_clsubs.c @@ -78,7 +78,7 @@ __FBSDID("$FreeBSD$"); #include <machine/stdarg.h> extern struct mtx ncl_iod_mutex; -extern struct proc *ncl_iodwant[NFS_MAXRAHEAD]; +extern enum nfsiod_state ncl_iodwant[NFS_MAXRAHEAD]; extern struct nfsmount *ncl_iodmount[NFS_MAXRAHEAD]; extern int ncl_numasync; extern unsigned int ncl_iodmax; @@ -100,7 +100,7 @@ ncl_uninit(struct vfsconf *vfsp) mtx_lock(&ncl_iod_mutex); ncl_iodmax = 0; for (i = 0; i < ncl_numasync; i++) - if (ncl_iodwant[i]) + if (ncl_iodwant[i] == NFSIOD_AVAILABLE) wakeup(&ncl_iodwant[i]); /* The last nfsiod to exit will wake us up when ncl_numasync hits 0 */ while (ncl_numasync) @@ -396,7 +396,7 @@ ncl_init(struct vfsconf *vfsp) /* Ensure async daemons disabled */ for (i = 0; i < NFS_MAXRAHEAD; i++) { - ncl_iodwant[i] = NULL; + ncl_iodwant[i] = NFSIOD_NOT_AVAILABLE; ncl_iodmount[i] = NULL; } ncl_nhinit(); /* Init the nfsnode table */ |
