OpenAFS CVS Commit: openafs/src/afs/LINUX by shadow

[cvs@GRAND.CENTRAL.ORG]

Update of /cvs/openafs/src/afs/LINUX
In directory GRAND.CENTRAL.ORG:/data/sb/openafs-stable-1_4_x/src/afs/LINUX

Modified Files:
      Tag: openafs-stable-1_4_x
	osi_file.c osi_misc.c osi_prototypes.h 
Log Message:
DELTA STABLE14-linux-conflate-rdwrs-20050419
AUTHOR chas@cmf.nrl.navy.mil
FIXES 17561

conflate the 2 rdwr routines we have


--- DELTA config for openafs-stable-1_4_x follows ---
STABLE14-linux-conflate-rdwrs-20050419 openafs/src/afs/LINUX/osi_file.c 1.19.2.5 1.19.2.6
STABLE14-linux-conflate-rdwrs-20050419 openafs/src/afs/LINUX/osi_misc.c 1.34.2.5 1.34.2.6
STABLE14-linux-conflate-rdwrs-20050419 openafs/src/afs/LINUX/osi_prototypes.h 1.6.2.5 1.6.2.6