diff options
| author | rwatson <rwatson@FreeBSD.org> | 2001-12-31 21:00:00 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2001-12-31 21:00:00 +0000 |
| commit | 85fc04400d2760738010ae522bfd792cf6c17b1d (patch) | |
| tree | 30760a8c55227a4b69dda14044a303cae72844e1 /sys/nfsclient | |
| parent | 9348f9cada916cf432a334eef7aae1b83de2f1b4 (diff) | |
| download | FreeBSD-src-85fc04400d2760738010ae522bfd792cf6c17b1d.zip FreeBSD-src-85fc04400d2760738010ae522bfd792cf6c17b1d.tar.gz | |
o Pass td into nfs_mountroot() to eliminate an XXX'd curthread use.
Since it's in the parent function anyway, might as well pass it
another layer down.
Obtained from: TrustedBSD Project
Diffstat (limited to 'sys/nfsclient')
| -rw-r--r-- | sys/nfsclient/nfs.h | 2 | ||||
| -rw-r--r-- | sys/nfsclient/nfs_vfsops.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sys/nfsclient/nfs.h b/sys/nfsclient/nfs.h index 42db54c..bc228ed 100644 --- a/sys/nfsclient/nfs.h +++ b/sys/nfsclient/nfs.h @@ -252,7 +252,7 @@ extern int nfs_debug; int nfs_init(struct vfsconf *vfsp); int nfs_uninit(struct vfsconf *vfsp); -int nfs_mountroot(struct mount *mp); +int nfs_mountroot(struct mount *mp, struct thread *td); int nfs_send(struct socket *, struct sockaddr *, struct mbuf *, struct nfsreq *); int nfs_sndlock(struct nfsreq *); diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c index d93f63e..123e829 100644 --- a/sys/nfsclient/nfs_vfsops.c +++ b/sys/nfsclient/nfs_vfsops.c @@ -375,14 +375,13 @@ nfsmout: * - build the rootfs mount point and call mountnfs() to do the rest. */ int -nfs_mountroot(struct mount *mp) +nfs_mountroot(struct mount *mp, struct thread *td) { struct mount *swap_mp; struct nfsmount *nmp = VFSTONFS(mp); struct nfsv3_diskless *nd = &nfsv3_diskless; struct socket *so; struct vnode *vp; - struct thread *td = curthread; /* XXX */ int error, i; u_long l; char buf[128]; @@ -737,7 +736,7 @@ nfs_mount(struct mount *mp, char *path, caddr_t data, struct nameidata *ndp, u_char nfh[NFSX_V3FHMAX]; if (path == NULL) { - nfs_mountroot(mp); + nfs_mountroot(mp, td); return (0); } error = copyin(data, (caddr_t)&args, sizeof (struct nfs_args)); |
