svn commit: r318997 - in head/sys: cddl/contrib/opensolaris/uts/common/fs/zfs fs/nfsclient kern sys

[Rick Macklem]

Konstantin Belousov wrote:
>Thank you.
>Indeed, the asignment should have been removed.  Below is the proposed
>correction.
>
>diff --git a/sys/fs/nfsclient/nfs_clport.c b/sys/fs/nfsclient/nfs_clport.c
>index 509c38b8614..44c0eae0179 100644
>--- a/sys/fs/nfsclient/nfs_clport.c
>+++ b/sys/fs/nfsclient/nfs_clport.c
>@@ -491,8 +491,7 @@ nfscl_loadattrcache(struct vnode **vpp, struct nfsvattr *nap, void > *nvaper,
>                * 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
Yep. Yhis revised one looks fine to me, rick