Attachment #179798 for bug #216939

View | Details | Raw Unified | Return to bug 216939
Collapse All | Expand All

Lines 5984-5989 Link Here

(-)sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c (+4 lines)
5984	error = zfs_znode_parent_and_name(zp, &dzp, name);	5984	error = zfs_znode_parent_and_name(zp, &dzp, name);
5985	if (error == 0) {	5985	if (error == 0) {
5986	len = strlen(name);	5986	len = strlen(name);
		5987	if (*ap->a_buflen < len)
		5988	error = SET_ERROR(ENOMEM);
		5989	}
		5990	if (error == 0) {
5987	*ap->a_buflen -= len;	5991	*ap->a_buflen -= len;
5988	bcopy(name, ap->a_buf + *ap->a_buflen, len);	5992	bcopy(name, ap->a_buf + *ap->a_buflen, len);
5989	*ap->a_vpp = ZTOV(dzp);	5993	*ap->a_vpp = ZTOV(dzp);




		size_t len;

		len = strlen(sep->se_name);
		if (*ap->a_buflen < len) {
			mutex_exit(&sdp->sd_lock);
			error = ENOMEM;
		} else {
			*ap->a_buflen -= len;
			bcopy(sep->se_name, ap->a_buf + *ap->a_buflen, len);
			mutex_exit(&sdp->sd_lock);
			vref(dvp);
			*ap->a_vpp = dvp;
		}
	}
	VN_RELE(dvp);


Return to bug 216939

Lines 1609-1619 Link Here

(-)sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c (-5 / +10 lines)
1609	size_t len;	1609	size_t len;
1610		1610
1611	len = strlen(sep->se_name);	1611	len = strlen(sep->se_name);
1612	*ap->a_buflen -= len;	1612	if (*ap->a_buflen < len) {
1613	bcopy(sep->se_name, ap->a_buf + *ap->a_buflen, len);	1613	mutex_exit(&sdp->sd_lock);
1614	mutex_exit(&sdp->sd_lock);	1614	error = ENOMEM;
1615	vref(dvp);	1615	} else {
1616	*ap->a_vpp = dvp;	1616	*ap->a_buflen -= len;
		1617	bcopy(sep->se_name, ap->a_buf + *ap->a_buflen, len);
		1618	mutex_exit(&sdp->sd_lock);
		1619	vref(dvp);
		1620	*ap->a_vpp = dvp;
		1621	}
1617	}	1622	}
1618	VN_RELE(dvp);	1623	VN_RELE(dvp);
1619		1624