Merge conflicts

diff --git a/Makefile.in b/Makefile.in
index 4f74f1b97782e50a2e4a14830b5f96cb2e5b5c7b..37ddfb1bc3124569489f394cf836c13365371a22 100644 (file)
--- 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 04e84578b234ca50d54777e88d3ac561ffc0cf54..20c3a28009ca07016e3bce026370b583d59691cd 100644 (file)
--- a/src/afs/LINUX/osi_vnodeops.c
+++ b/src/afs/LINUX/osi_vnodeops.c
@@ -23,7 +23,7 @@
 #include <afsconfig.h>
 #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 (file)
index 50e5e72..0000000
--- a/src/afsd/afs.ppc_darwin.plist.in
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
-<dict>
-       <key>CFBundleDevelopmentRegion</key>
-       <string>English</string>
-       <key>CFBundleExecutable</key>
-       <string>afs</string>
-       <key>CFBundleIdentifier</key>
-       <string>org.openafs.filesystems.afs</string>
-       <key>CFBundleInfoDictionaryVersion</key>
-       <string>6.0</string>
-       <key>CFBundleName</key>
-       <string>afs</string>
-       <key>CFBundlePackageType</key>
-       <string>KEXT</string>
-       <key>CFBundleShortVersionString</key>
-       <string>@VERSION@</string>
-       <key>CFBundleSignature</key>
-       <string>????</string>
-       <key>CFBundleVersion</key>
-       <string>@VERSION@</string>
-       <key>OSBundleLibraries</key>
-       <dict>
-               <key>com.apple.kernel.bsd</key>
-               <string>1.0.0b1</string>
-               <key>com.apple.kernel.mach</key>
-               <string>1.0.0b1</string>
-       </dict>
-</dict>
-</plist>

diff --git a/src/afsd/afs.ppc_darwin_12.plist b/src/afsd/afs.ppc_darwin_12.plist
deleted file mode 100644 (file)
index 4c05dd1..0000000
--- 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 (file)
index 4c05dd1..0000000
--- 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 (file)
index 0000000..4c05dd1
--- /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 5b1d87b8abf059da2801ff035e22aa35a1aac8c0..0063b334bcc4de341d91208741ae811fb7acecf9 100644 (file)
--- 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 f1338f7d637fbe642456be81775e31b2cb521f1f..3df987cd00f829b507a09f3ecbdecc5355281f13 100644 (file)
--- 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 9d736e464705f81802d1ccda25ba6002981f14c6..09ae15aee25346abb6575cb2f9580b24871734db 100644 (file)
--- a/src/lwp/preempt.c
+++ b/src/lwp/preempt.c
@@ -16,10 +16,10 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-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 <sys/time.h>

diff --git a/src/ptserver/pt_util.c b/src/ptserver/pt_util.c
index a80ce08cb6b30d2234209d7f363280da1951d307..87c9a3d4eb1f09655891ecc221ae3206801e2c80 100644 (file)
--- 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 <afsconfig.h>
 #include <afs/param.h>
 
-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 <lock.h>
 #include <netinet/in.h>
@@ -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 25634e5d686814575b8f72ff80d8fca7c443b047..bdac38b372c76639cf385668a29c536f0c745e34 100644 (file)
--- a/src/ptserver/ptserver.c
+++ b/src/ptserver/ptserver.c
@@ -10,7 +10,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-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 <afs/stds.h>
 #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 fe0e0fec099ef933a6737a6ed96a27c99afa2779..8cd104bc1cd904e2870cef729afe7bbbaf5f47d1 100644 (file)
--- a/src/viced/afsfileprocs.c
+++ b/src/viced/afsfileprocs.c
@@ -28,7 +28,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-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 <stdio.h>
 #include <stdlib.h>
@@ -78,7 +78,7 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/viced/afsfileprocs.c,v 1.4 2001/09/11 1
 #include <rx/rx.h>
 #include <rx/rx_globals.h>
 #include <sys/stat.h>
-#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 <sys/map.h>
 #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 <sys/statfs.h>
 #include <sys/lockf.h>
 #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 <sys/dk.h>
 #endif
 #endif

diff --git a/src/vol/partition.c b/src/vol/partition.c
index 24d2cc09d5549231a4baf68a1f8526e6988786cb..d5177180a9fb3780c53358146831680460ebfd7b 100644 (file)
--- a/src/vol/partition.c
+++ b/src/vol/partition.c
@@ -18,7 +18,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-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 <ctype.h>
 #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 <sys/statvfs.h>
 #endif /* AFS_HAVE_STATVFS */
-#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
 #include <sys/mount.h>
 #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 <sys/fs/ufs_fs.h>
 #else
-#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
 #include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>
 #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 <sys/fs.h>
 #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