svn commit: r200212 - stable/7/sys/nfsserver

[Jaakko Heinonen]

Author: jh
Date: Mon Dec  7 13:38:10 2009
New Revision: 200212
URL: http://svn.freebsd.org/changeset/base/200212

Log:
  MFC r197525:
  
  Ensure that tv_sec is between INT32_MIN and INT32_MAX, so ZFS won't object.
  This completes the fix from r185586.
  
  Approved by:	trasz (mentor)

Modified:
  stable/7/sys/nfsserver/nfs_serv.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/nfsserver/nfs_serv.c
==============================================================================
--- stable/7/sys/nfsserver/nfs_serv.c	Mon Dec  7 08:38:44 2009	(r200211)
+++ stable/7/sys/nfsserver/nfs_serv.c	Mon Dec  7 13:38:10 2009	(r200212)
@@ -1743,7 +1743,7 @@ nfsrv_create(struct nfsrv_descript *nfsd
 			tl = nfsm_dissect_nonblock(u_int32_t *,
 			    NFSX_V3CREATEVERF);
 			/* Unique bytes, endianness is not important. */
-			cverf.tv_sec  = tl[0];
+			cverf.tv_sec  = (int32_t)tl[0];
 			cverf.tv_nsec = tl[1];
 			exclusive_flag = 1;
 			break;