From: Sam Hartman Date: Thu, 20 Sep 2001 06:47:48 +0000 (+0000) Subject: Merge conflicts X-Git-Tag: debian/1.2.1-1~2 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=50e232acee3251e66cc4b3cf0d618f8d24e70d1a;p=packages%2Fo%2Fopenafs.git Merge conflicts --- diff --git a/Makefile.in b/Makefile.in index 4f74f1b97..37ddfb1bc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -30,6 +30,7 @@ MKAFS_OSTYPE=@MKAFS_OSTYPE@ # Systype-specific items LINUX_KERNEL_PATH=@LINUX_KERNEL_PATH@ LINUX_VERSION=@LINUX_VERSION@ +DARWIN_INFOFILE=@DARWIN_INFOFILE@ # Other items LIB_AFSDB=@LIB_AFSDB@ @@ -291,7 +292,7 @@ bozo: project ntp audit vfsck: vol set -x; \ case ${SYS_NAME} in \ - sgi_* | *linux* | rs_aix42 | ppc_darwin* | hp_ux* | *fbsd* ) \ + sgi_* | *linux* | rs_aix42 | ppc_darwin* | hp_ux* | *fbsd* | *_obsd* ) \ echo skip vfsck for ${SYS_NAME} ;; \ * ) \ ${COMPILE_PART1} vfsck ${COMPILE_PART2} ;; \ @@ -310,7 +311,7 @@ login: project kauth rxkad ${COMPILE_PART1} login ${COMPILE_PART2} ;; \ sun4x_* | hp_ux11* | *linux* | *fbsd* ) \ ${COMPILE_PART1} pam ${COMPILE_PART2} ;; \ - ppc_darwin* ) \ + ppc_darwin* | *_obsd* ) \ echo Skipping login for ${SYS_NAME} ;; \ * ) \ ${COMPILE_PART1} login ${COMPILE_PART2} ;; \ @@ -354,7 +355,7 @@ libafs_tree: libafs_setup ${KERNELDIR} [ -d libafs_tree/$$d ] || mkdir -p libafs_tree/$$d; \ done for f in `cd src/libafs; find . -name '*.[ch]'` \ - Makefile.common Makefile.extradefs \ + Makefile.common Makefile.extradefs ${DARWIN_INFOFILE} \ afs.shutdown afs.startup redhat.sh sgi_master sgi_system \ ; do \ ${INSTALL} -c -f src/libafs/$$f libafs_tree/$$f; \ @@ -371,7 +372,7 @@ libafs_tree: libafs_setup ${KERNELDIR} libuafs: libuafs_setup ${UKERNELDIR} set -x; \ case ${SYS_NAME} in \ - hp_ux102* ) \ + hp_ux102* | *_obsd* ) \ echo Skipping libuafs for ${SYS_NAME} ;; \ * ) \ ${COMPILE_PART1} libuafs ${COMPILE_PART2} ;; \ diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c index 04e84578b..20c3a2800 100644 --- a/src/afs/LINUX/osi_vnodeops.c +++ b/src/afs/LINUX/osi_vnodeops.c @@ -23,7 +23,7 @@ #include #include "../afs/param.h" -RCSID("$Header: /tmp/cvstemp/openafs/src/afs/LINUX/osi_vnodeops.c,v 1.9 2001/09/11 15:47:37 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/afs/LINUX/osi_vnodeops.c,v 1.10 2001/09/20 06:47:38 hartmans Exp $"); #include "../afs/sysincludes.h" #include "../afs/afsincludes.h" @@ -134,6 +134,10 @@ static ssize_t afs_linux_write(struct file *fp, const char *buf, size_t count, ObtainWriteLock(&vcp->lock, 530); vcp->m.Date = osi_Time(); /* set modification time */ afs_FakeClose(vcp, credp); + if (code>=0) + code2 = afs_DoPartialWrite(vcp, &treq); + if (code2 && code >=0) + code = (ssize_t) -code2; ReleaseWriteLock(&vcp->lock); afs_Trace4(afs_iclSetp, CM_TRACE_WRITEOP, ICL_TYPE_POINTER, vcp, diff --git a/src/afsd/afs.ppc_darwin.plist.in b/src/afsd/afs.ppc_darwin.plist.in deleted file mode 100644 index 50e5e72d9..000000000 --- a/src/afsd/afs.ppc_darwin.plist.in +++ /dev/null @@ -1,31 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - afs - CFBundleIdentifier - org.openafs.filesystems.afs - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - afs - CFBundlePackageType - KEXT - CFBundleShortVersionString - @VERSION@ - CFBundleSignature - ???? - CFBundleVersion - @VERSION@ - OSBundleLibraries - - com.apple.kernel.bsd - 1.0.0b1 - com.apple.kernel.mach - 1.0.0b1 - - - diff --git a/src/afsd/afs.ppc_darwin_12.plist b/src/afsd/afs.ppc_darwin_12.plist deleted file mode 100644 index 4c05dd1f0..000000000 --- a/src/afsd/afs.ppc_darwin_12.plist +++ /dev/null @@ -1,11 +0,0 @@ -{ - Description = "OpenAFS network file system"; - Provides = ("AFS"); - Requires = ("Resolver"); - OrderPreference = "None"; - Messages = - { - start = "Starting OpenAFS file system"; - stop = "Stopping OpenAFS file system"; - }; -} diff --git a/src/afsd/afs.ppc_darwin_13.plist b/src/afsd/afs.ppc_darwin_13.plist deleted file mode 100644 index 4c05dd1f0..000000000 --- a/src/afsd/afs.ppc_darwin_13.plist +++ /dev/null @@ -1,11 +0,0 @@ -{ - Description = "OpenAFS network file system"; - Provides = ("AFS"); - Requires = ("Resolver"); - OrderPreference = "None"; - Messages = - { - start = "Starting OpenAFS file system"; - stop = "Stopping OpenAFS file system"; - }; -} diff --git a/src/afsd/afs.rc.darwin.plist b/src/afsd/afs.rc.darwin.plist new file mode 100644 index 000000000..4c05dd1f0 --- /dev/null +++ b/src/afsd/afs.rc.darwin.plist @@ -0,0 +1,11 @@ +{ + Description = "OpenAFS network file system"; + Provides = ("AFS"); + Requires = ("Resolver"); + OrderPreference = "None"; + Messages = + { + start = "Starting OpenAFS file system"; + stop = "Stopping OpenAFS file system"; + }; +} diff --git a/src/config/Makefile.ppc_linux22.in b/src/config/Makefile.ppc_linux22.in index 5b1d87b8a..0063b334b 100644 --- a/src/config/Makefile.ppc_linux22.in +++ b/src/config/Makefile.ppc_linux22.in @@ -35,7 +35,8 @@ MT_CC=cc MV=mv RANLIB=ranlib RM=rm - +INSTALL=${TOP_SRCDIR}/pinstall/pinstall +# # Other OS specific requirements # YACC = bison -y diff --git a/src/libafs/MakefileProto.LINUX.in b/src/libafs/MakefileProto.LINUX.in index f1338f7d6..3df987cd0 100644 --- a/src/libafs/MakefileProto.LINUX.in +++ b/src/libafs/MakefileProto.LINUX.in @@ -154,6 +154,9 @@ ${COMPDIRS} ${INSTDIRS} ${DESTDIRS}: if [ "$$m" = "MP" ] ; then \ SMP_DEF="-DAFS_SMP @RHCONFIG_MP@ ${LOCAL_SMP_DEF}" ; \ TARG="libafs.mp" ; \ + elif [ "$$m" = "EP" ] ; then \ + SMP_DEF="-DAFS_SMP @RHCONFIG_MP@ ${LOCAL_SMP_DEF}" ; \ + TARG="libafs.ep" ; \ else \ SMP_DEF="@RHCONFIG_SP@ ${LOCAL_SMP_DEF}" ; \ TARG=libafs ; \ @@ -165,19 +168,24 @@ ${COMPDIRS} ${INSTDIRS} ${DESTDIRS}: linux_compdirs_libafs: libafs linux_compdirs_libafs.mp: libafs.mp +linux_compdirs_libafs.ep: libafs.ep linux_instdirs_libafs: install_libafs linux_instdirs_libafs.mp: install_libafs.mp +linux_instdirs_libafs.ep: install_libafs.ep linux_destdirs_libafs: dest_libafs linux_destdirs_libafs.mp: dest_libafs.mp +linux_destdirs_libafs.ep: dest_libafs.ep # Below this line are targets when in the COMMON directory: # For Linux there is no kernel NFS server. LIBAFS = libafs-${CLIENT}.o LIBAFS_MP = libafs-${CLIENT}.mp.o +LIBAFS_EP = libafs-${CLIENT}.ep.o INST_LIBAFS = ${DESTDIR}${afskerneldir}/${LIBAFS} INST_LIBAFS_MP = ${DESTDIR}${afskerneldir}/${LIBAFS_MP} +INST_LIBAFS_EP = ${DESTDIR}${afskerneldir}/${LIBAFS_EP} DEST_LIBAFS = ${DEST}/root.client/usr/vice/etc/modload/openafs.o DEST_LIBAFS_MP = ${DEST}/root.client/usr/vice/etc/modload/openafs.mp.o @@ -189,6 +197,9 @@ libafs: $(LIBAFS) libafs.mp: $(LIBAFS_MP) echo MP Build Complete +libafs.ep: $(LIBAFS_EP) + echo EP Build Complete + ${LIBAFS}: $(AFSAOBJS) $(AFSNONFSOBJS) $(RM) -f $@ $(LD) -r -o $@ $(AFSAOBJS) $(AFSNONFSOBJS) @@ -197,30 +208,46 @@ ${LIBAFS_MP}: $(AFSAOBJS) $(AFSNONFSOBJS) $(RM) -f $@ $(LD) -r -o $@ $(AFSAOBJS) $(AFSNONFSOBJS) +${LIBAFS_EP}: $(AFSAOBJS) $(AFSNONFSOBJS) + $(RM) -f $@ + $(LD) -r -o $@ $(AFSAOBJS) $(AFSNONFSOBJS) + install_libafs: $(INST_LIBAFS) echo SP Install Complete install_libafs.mp: $(INST_LIBAFS_MP) echo MP Install Complete +install_libafs.ep: $(INST_LIBAFS_EP) + echo EP Install Complete + dest_libafs: $(DEST_LIBAFS) echo SP Install Complete dest_libafs.mp: $(DEST_LIBAFS_MP) echo MP Install Complete +dest_libafs.ep: $(DEST_LIBAFS_EP) + echo EP Install Complete + $(INST_LIBAFS): $(LIBAFS) ${INSTALL} -f $? $@ $(INST_LIBAFS_MP): $(LIBAFS_MP) ${INSTALL} -f $? $@ +$(INST_LIBAFS_EP): $(LIBAFS_EP) + ${INSTALL} -f $? $@ + $(DEST_LIBAFS): $(LIBAFS) ${INSTALL} -f $? $@ $(DEST_LIBAFS_MP): $(LIBAFS_MP) ${INSTALL} -f $? $@ +$(DEST_LIBAFS_EP): $(LIBAFS_EP) + ${INSTALL} -f $? $@ + # Linux specific objects osi_alloc.o: $(AFS)/osi_alloc.c diff --git a/src/lwp/preempt.c b/src/lwp/preempt.c index 9d736e464..09ae15aee 100644 --- a/src/lwp/preempt.c +++ b/src/lwp/preempt.c @@ -16,10 +16,10 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/lwp/preempt.c,v 1.8 2001/09/11 15:48:27 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/lwp/preempt.c,v 1.9 2001/09/20 06:47:46 hartmans Exp $"); -#if defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) || defined(AFS_DJGPP_ENV) +#if defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) || defined(AFS_DJGPP_ENV) int PRE_Block = 0; #else #include diff --git a/src/ptserver/pt_util.c b/src/ptserver/pt_util.c index a80ce08cb..87c9a3d4e 100644 --- a/src/ptserver/pt_util.c +++ b/src/ptserver/pt_util.c @@ -1,4 +1,4 @@ -/* $Id: pt_util.c,v 1.4 2001/07/15 07:22:30 hartmans Exp $ */ +/* $Id: pt_util.c,v 1.5 2001/09/20 06:47:46 hartmans Exp $ */ /* * @@ -21,7 +21,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/ptserver/pt_util.c,v 1.4 2001/07/15 07:22:30 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/ptserver/pt_util.c,v 1.5 2001/09/20 06:47:46 hartmans Exp $"); #include #include @@ -193,7 +193,7 @@ char **argv; } Initdb(); - initialize_pt_error_table(); + initialize_PT_error_table(); if (wflag) { struct usr_list *u; diff --git a/src/ptserver/ptserver.c b/src/ptserver/ptserver.c index 25634e5d6..bdac38b37 100644 --- a/src/ptserver/ptserver.c +++ b/src/ptserver/ptserver.c @@ -10,7 +10,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/ptserver/ptserver.c,v 1.5 2001/09/11 15:48:32 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/ptserver/ptserver.c,v 1.6 2001/09/20 06:47:47 hartmans Exp $"); #include #ifdef AFS_AIX32_ENV @@ -81,7 +81,6 @@ void main (argc, argv) #endif struct afsconf_cell info; int kerberosKeys; /* set if found some keys */ - afs_int32 i,j; int lwps = 3; char clones[MAXHOSTSPERCELL]; @@ -157,8 +156,6 @@ void main (argc, argv) } #endif else if (*arg == '-') { - usage: - /* hack in help flag support */ #ifndef AFS_NT40_ENV diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c index fe0e0fec0..8cd104bc1 100644 --- a/src/viced/afsfileprocs.c +++ b/src/viced/afsfileprocs.c @@ -28,7 +28,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/viced/afsfileprocs.c,v 1.4 2001/09/11 15:48:55 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/viced/afsfileprocs.c,v 1.5 2001/09/20 06:47:47 hartmans Exp $"); #include #include @@ -78,7 +78,7 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/viced/afsfileprocs.c,v 1.4 2001/09/11 1 #include #include #include -#if ! defined(AFS_SGI_ENV) && ! defined(AFS_AIX32_ENV) && ! defined(AFS_NT40_ENV) && ! defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_FBSD_ENV) +#if ! defined(AFS_SGI_ENV) && ! defined(AFS_AIX32_ENV) && ! defined(AFS_NT40_ENV) && ! defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV) #include #endif #if !defined(AFS_NT40_ENV) @@ -89,7 +89,7 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/viced/afsfileprocs.c,v 1.4 2001/09/11 1 #include #include #else -#if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_FBSD_ENV) +#if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV) #include #endif #endif diff --git a/src/vol/partition.c b/src/vol/partition.c index 24d2cc09d..d5177180a 100644 --- a/src/vol/partition.c +++ b/src/vol/partition.c @@ -18,7 +18,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/vol/partition.c,v 1.7 2001/07/15 07:22:32 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/vol/partition.c,v 1.8 2001/09/20 06:47:48 hartmans Exp $"); #include #ifdef AFS_NT40_ENV @@ -32,7 +32,7 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/vol/partition.c,v 1.7 2001/07/15 07:22: #if AFS_HAVE_STATVFS #include #endif /* AFS_HAVE_STATVFS */ -#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) #include #endif @@ -46,7 +46,7 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/vol/partition.c,v 1.7 2001/07/15 07:22: #ifdef AFS_SUN5_ENV #include #else -#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) #include #include #else @@ -54,7 +54,7 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/vol/partition.c,v 1.7 2001/07/15 07:22: #endif #endif #else /* AFS_VFSINCL_ENV */ -#if !defined(AFS_AIX_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_FBSD_ENV) +#if !defined(AFS_AIX_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV) #include #endif #endif /* AFS_VFSINCL_ENV */ @@ -456,7 +456,7 @@ int VAttachPartitions(void) } #endif -#if defined(AFS_DUX40_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined(AFS_DUX40_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) int VAttachPartitions(void) { int errors = 0; @@ -803,7 +803,6 @@ void VResetDiskUsage(void) void VAdjustDiskUsage_r(Error *ec, Volume *vp, afs_int32 blocks, afs_int32 checkBlocks) { - afs_int32 rem, minavail; *ec = 0; /* why blocks instead of checkBlocks in the check below? Otherwise, any check for less than BlocksSpare would skip the error-checking path, and we @@ -811,6 +810,8 @@ void VAdjustDiskUsage_r(Error *ec, Volume *vp, afs_int32 blocks, afs_int32 check blocks. */ if (blocks > 0) { #ifdef AFS_AIX32_ENV + afs_int32 rem, minavail; + if ((rem = vp->partition->free - checkBlocks) < (minavail = (vp->partition->totalUsable * aixlow_water) / 100)) #else @@ -833,9 +834,10 @@ void VAdjustDiskUsage(Error *ec, Volume *vp, afs_int32 blocks, afs_int32 checkBl int VDiskUsage_r(Volume *vp, afs_int32 blocks) { - afs_int32 rem, minavail; if (blocks > 0) { #ifdef AFS_AIX32_ENV + afs_int32 rem, minavail; + if ((rem = vp->partition->free - blocks) < (minavail = (vp->partition->totalUsable * aixlow_water) / 100)) #else