svn commit: r221205 - head/sys/fs/nfsclient
Rick Macklem
rmacklem at FreeBSD.org
Fri Apr 29 12:30:15 UTC 2011
Author: rmacklem
Date: Fri Apr 29 12:30:15 2011
New Revision: 221205
URL: http://svn.freebsd.org/changeset/base/221205
Log:
The build was broken by r221190 for 64bit arches like amd64.
This patch fixes it.
MFC after: 2 weeks
Modified:
head/sys/fs/nfsclient/nfs_clvfsops.c
Modified: head/sys/fs/nfsclient/nfs_clvfsops.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clvfsops.c Fri Apr 29 10:33:54 2011 (r221204)
+++ head/sys/fs/nfsclient/nfs_clvfsops.c Fri Apr 29 12:30:15 2011 (r221205)
@@ -763,6 +763,7 @@ nfs_mount(struct mount *mp)
char *opt, *name, *secname;
int negnametimeo = NFS_DEFAULT_NEGNAMETIMEO;
int dirlen, has_nfs_args_opt, krbnamelen, srvkrbnamelen;
+ size_t hstlen;
has_nfs_args_opt = 0;
if (vfs_filteropt(mp->mnt_optnew, nfs_opts)) {
@@ -1027,10 +1028,10 @@ nfs_mount(struct mount *mp)
args.fhsize);
if (error != 0)
goto out;
- error = copyinstr(args.hostname, hst, MNAMELEN - 1, &len);
+ error = copyinstr(args.hostname, hst, MNAMELEN - 1, &hstlen);
if (error != 0)
goto out;
- bzero(&hst[len], MNAMELEN - len);
+ bzero(&hst[hstlen], MNAMELEN - hstlen);
args.hostname = hst;
/* sockargs() call must be after above copyin() calls */
error = getsockaddr(&nam, (caddr_t)args.addr,
More information about the svn-src-all
mailing list