svn commit: r229425 -
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Dimitry Andric
dim at FreeBSD.org
Tue Jan 3 20:53:07 UTC 2012
Author: dim
Date: Tue Jan 3 20:53:07 2012
New Revision: 229425
URL: http://svn.freebsd.org/changeset/base/229425
Log:
In sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c, check the
the number of links against LINK_MAX (which is INT16_MAX), not against
UINT32_MAX. Otherwise, the constant would implicitly be converted to
-1.
Reviewed by: pjd
MFC after: 1 week
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Tue Jan 3 20:52:05 2012 (r229424)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Tue Jan 3 20:53:07 2012 (r229425)
@@ -2698,7 +2698,7 @@ zfs_getattr(vnode_t *vp, vattr_t *vap, i
links = zp->z_links + 1;
else
links = zp->z_links;
- vap->va_nlink = MIN(links, UINT32_MAX); /* nlink_t limit! */
+ vap->va_nlink = MIN(links, LINK_MAX); /* nlink_t limit! */
vap->va_size = zp->z_size;
#ifdef sun
vap->va_rdev = vp->v_rdev;
More information about the svn-src-head
mailing list