solaris10-20040624

FIXES 5396

as substantially done by Jeff Woodward <Jeffrey.B.Woodward@Dartmouth.EDU>,
work diffed out and slightly rewritten

====================
This delta was composed from multiple commits as part of the CVS->Git migration.
The checkin message with each commit was inconsistent.
The following are the additional commit messages.
====================
FIXES 5396

this should be the correct way to give up the socket on all solaris versions
This commit is contained in:
Kris Van Hees 2004-07-08 06:23:53 +00:00 committed by Derrick Brashear
parent 775933e895
commit fa82c5e6a9
2 changed files with 3 additions and 6 deletions

View File

@ -35,7 +35,7 @@ process.o : process.s process.i386.s process.c
@case "$(SYS_NAME)" in \
pmax_he1) \
$(CCOBJ) ${LWP_DBG} ${LWP_OPTMZ} -c -I${TOP_INCDIR} process.s;; \
sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53 | sun4_53 | sun4_52 | sun4_54 | sun4c_54 | sun4m_54 | sun4x_5?) \
sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53 | sun4_53 | sun4_52 | sun4_54 | sun4c_54 | sun4m_54 | sun4x_5* ) \
/usr/ccs/lib/cpp -P -I${TOP_INCDIR} ${srcdir}/process.s process.ss; \
${AS} process.ss -o process.o; \
$(RM) process.ss ;; \

View File

@ -341,14 +341,11 @@ osi_FreeSocket(register struct osi_socket *asocket)
afs_osi_Sleep(&rxk_ListenerPid);
}
#ifdef AFS_SUN510_ENV
/* Was sockfs_sounbind(so, 0); sockfs_sockfree(so); That's wrong */
vp = SOTOV(so);
VOP_CLOSE(vp, FREAD|FWRITE, 1, (offset_t)0, CRED());
VN_RELE(vp);
#else
sockfs_sounbind(so, 0);
sockfs_sockfree(so);
#endif
return 0;
}