svn commit: r319253 - head/sys/fs/nfsclient

[Konstantin Belousov]

Author: kib
Date: Tue May 30 21:20:54 2017
New Revision: 319253
URL: https://svnweb.freebsd.org/changeset/base/319253

Log:
  Fix bug in r318997: remove the line which overrides vn_fsid()
  calculation.
  
  Noted by:	jhb
  Reviewed by:	rmacklem
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/fs/nfsclient/nfs_clport.c

Modified: head/sys/fs/nfsclient/nfs_clport.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clport.c	Tue May 30 21:03:44 2017	(r319252)
+++ head/sys/fs/nfsclient/nfs_clport.c	Tue May 30 21:20:54 2017	(r319253)
@@ -491,8 +491,7 @@ nfscl_loadattrcache(struct vnode **vpp, struct nfsvatt
 		 * in the mounted subtree.
 		 */
 		vn_fsid(vp, vap);
-		vap->va_fsid = np->n_vattr.na_filesid[0];
-		if (vap->va_fsid == np->n_vattr.na_filesid[0])
+		if ((uint32_t)vap->va_fsid == np->n_vattr.na_filesid[0])
 			vap->va_fsid = hash32_buf(
 			    np->n_vattr.na_filesid, 2 * sizeof(uint64_t), 0);
 	} else