aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Watson <rwatson@FreeBSD.org>2001-12-31 21:00:00 +0000
committerRobert Watson <rwatson@FreeBSD.org>2001-12-31 21:00:00 +0000
commit147839396c72b2d23a25c605ffeb42db513be311 (patch)
tree30760a8c55227a4b69dda14044a303cae72844e1
parent1b17a3c9cadc9f533de691e8736ec3445c47448a (diff)
Notes
-rw-r--r--sys/nfsclient/nfs.h2
-rw-r--r--sys/nfsclient/nfs_vfsops.c5
2 files changed, 3 insertions, 4 deletions
diff --git a/sys/nfsclient/nfs.h b/sys/nfsclient/nfs.h
index 42db54c9cf61..bc228ed1d5f7 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 d93f63ecbdae..123e82966886 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));