summaryrefslogtreecommitdiffstats
path: root/sys/nfsclient
diff options
context:
space:
mode:
authorjamie <jamie@FreeBSD.org>2009-06-13 15:39:12 +0000
committerjamie <jamie@FreeBSD.org>2009-06-13 15:39:12 +0000
commitf419891544e311aa974e0648e0455a9de14ea0fa (patch)
treef9cfb93ff7fc2f89561efcde362151b31946e095 /sys/nfsclient
parentdbcc94be36eb7e16660d9d09b9885c37b7e22d1d (diff)
downloadFreeBSD-src-f419891544e311aa974e0648e0455a9de14ea0fa.zip
FreeBSD-src-f419891544e311aa974e0648e0455a9de14ea0fa.tar.gz
Rename the host-related prison fields to be the same as the host.*
parameters they represent, and the variables they replaced, instead of abbreviated versions of them. Approved by: bz (mentor)
Diffstat (limited to 'sys/nfsclient')
-rw-r--r--sys/nfsclient/bootp_subr.c2
-rw-r--r--sys/nfsclient/nfs_vfsops.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/sys/nfsclient/bootp_subr.c b/sys/nfsclient/bootp_subr.c
index 1d7a308..10fc8c4 100644
--- a/sys/nfsclient/bootp_subr.c
+++ b/sys/nfsclient/bootp_subr.c
@@ -1563,7 +1563,7 @@ bootpc_decode_reply(struct nfsv3_diskless *nd, struct bootpc_ifcontext *ifctx,
} else {
strcpy(nd->my_hostnam, p);
mtx_lock(&prison0.pr_mtx);
- strcpy(prison0.pr_host, p);
+ strcpy(prison0.pr_hostname, p);
mtx_unlock(&prison0.pr_mtx);
printf("hostname %s ", p);
gctx->sethostname = ifctx;
diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c
index 5bc5cfd..6a28eab 100644
--- a/sys/nfsclient/nfs_vfsops.c
+++ b/sys/nfsclient/nfs_vfsops.c
@@ -524,7 +524,8 @@ nfs_mountroot(struct mount *mp)
* mount the right /var based upon its preset value.
*/
mtx_lock(&prison0.pr_mtx);
- strlcpy(prison0.pr_host, nd->my_hostnam, sizeof (prison0.pr_host));
+ strlcpy(prison0.pr_hostname, nd->my_hostnam,
+ sizeof (prison0.pr_hostname));
mtx_unlock(&prison0.pr_mtx);
inittodr(ntohl(nd->root_time));
return (0);
OpenPOWER on IntegriCloud