Import upstream 1.4.6 release.

diff --git a/configure b/configure
index e62e8d70dd03e6ef6d3ce65fd8e463e92346d759..917e0a0872ac4b8c3bbe9a2e2ee41e066e674d3d 100644 (file)
--- a/configure
+++ b/configure
@@ -2170,7 +2170,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=openafs
- VERSION=1.4.5
+ VERSION=1.4.6
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2318,7 +2318,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 ac_config_headers="$ac_config_headers src/config/afsconfig.h"
 
-MACOS_VERSION=1.4.5
+MACOS_VERSION=1.4.6
 
 
 

diff --git a/configure-libafs b/configure-libafs
index 39092b039acece36064725dd93c14500b59f2411..e65bc9a6b8ebeef9f8ab7807984f0a59502bb863 100644 (file)
--- a/configure-libafs
+++ b/configure-libafs
@@ -2170,7 +2170,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=openafs-libafs
- VERSION=1.4.5
+ VERSION=1.4.6
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2318,7 +2318,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 ac_config_headers="$ac_config_headers src/config/afsconfig.h"
 
-MACOS_VERSION=1.4.5
+MACOS_VERSION=1.4.6
 
 
 

diff --git a/configure-libafs.in b/configure-libafs.in
index 8c211b0eebaffbc1ddcea8166e5992ff178fe454..7c24361aa0221fa15b7845c372735322df332b76 100644 (file)
--- a/configure-libafs.in
+++ b/configure-libafs.in
@@ -1,7 +1,7 @@
 AC_INIT(src/libafs/Makefile.common.in)
-AM_INIT_AUTOMAKE(openafs-libafs,1.4.5)
+AM_INIT_AUTOMAKE(openafs-libafs,1.4.6)
 AC_CONFIG_HEADER(src/config/afsconfig.h)
-MACOS_VERSION=1.4.5
+MACOS_VERSION=1.4.6
 
 AC_SUBST(MACOS_VERSION)
 

diff --git a/configure.in b/configure.in
index 350778c58f58fb321eb6409ab38385f89a1fcb88..ba72e0a37d570fe0dde4132640d1f7d55d92d286 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 AC_INIT(src/config/stds.h)
-AM_INIT_AUTOMAKE(openafs,1.4.5)
+AM_INIT_AUTOMAKE(openafs,1.4.6)
 AC_CONFIG_HEADER(src/config/afsconfig.h)
-MACOS_VERSION=1.4.5
+MACOS_VERSION=1.4.6
 
 AC_SUBST(MACOS_VERSION)
 

diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c
index d4308ad76ced574a4cd291dcc9f41e6ec85d68d0..31dce63467b0c228a8626e39bc54a0cc1d567bc7 100644 (file)
--- a/src/viced/afsfileprocs.c
+++ b/src/viced/afsfileprocs.c
@@ -29,7 +29,7 @@
 #include <afs/param.h>
 
 RCSID
-    ("$Header: /cvs/openafs/src/viced/afsfileprocs.c,v 1.81.2.43 2007/08/21 08:28:37 jaltman Exp $");
+    ("$Header: /cvs/openafs/src/viced/afsfileprocs.c,v 1.81.2.43.2.1 2007/12/13 20:59:29 shadow Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -6112,7 +6112,9 @@ common_GiveUpCallBacks(struct rx_call *acall, struct AFSCBFids *FidArray,
                 (tcon->peer ? tcon->peer->host : 0)));
        errorCode = GetClient(tcon, &client);
        if (!errorCode) {
+           H_LOCK;
            DeleteAllCallBacks_r(client->host, 1);
+           H_UNLOCK;
            PutClient(&client);
        }
     } else {

diff --git a/src/viced/callback.c b/src/viced/callback.c
index 66f674e2255b1c846e45e50a61c79d5692dea656..ecc017f58976eaad6c4905e913e9a3f9fe188d34 100644 (file)
--- a/src/viced/callback.c
+++ b/src/viced/callback.c
@@ -83,7 +83,7 @@
 #include <afs/param.h>
 
 RCSID
-    ("$Header: /cvs/openafs/src/viced/callback.c,v 1.55.2.18 2007/10/24 15:37:32 shadow Exp $");
+    ("$Header: /cvs/openafs/src/viced/callback.c,v 1.55.2.18.2.2 2007/12/13 20:57:11 shadow Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>            /* for malloc() */
@@ -493,7 +493,7 @@ CDelPtr(register struct FileEntry *fe, register afs_uint32 * cbp,
        CcdelB++;
     *cbp = cb->cnext;
     FreeCB(cb);
-    if (deletefe && (--fe->ncbs == 0))
+    if ((--fe->ncbs == 0) && deletefe)
        FDel(fe);
     return 0;
 }
@@ -1030,6 +1030,7 @@ DeleteFileCallBacks(AFSFid * fid)
        TDel(cb);
        HDel(cb);
        FreeCB(cb);
+       fe->ncbs--;
     }
     FDel(fe);
     H_UNLOCK;
@@ -1860,7 +1861,7 @@ ReadDump(char *file)
     read(fd, &tfirst, sizeof(tfirst));
     read(fd, &freelisthead, sizeof(freelisthead));
     CB = ((struct CallBack
-          *)(calloc(cbstuff.nblks, sizeof(struct FileEntry)))) - 1;
+          *)(calloc(cbstuff.nblks, sizeof(struct CallBack)))) - 1;
     FE = ((struct FileEntry
           *)(calloc(cbstuff.nblks, sizeof(struct FileEntry)))) - 1;
     CBfree = (struct CallBack *)itocb(freelisthead);

diff --git a/src/viced/host.c b/src/viced/host.c
index 25ce9907feadee1b9e7e5a1535ac13deeeae26d4..d9d1e2ebdfa1b2bfe2cbbe5d80523e9a622c7977 100644 (file)
--- a/src/viced/host.c
+++ b/src/viced/host.c
@@ -11,7 +11,7 @@
 #include <afs/param.h>
 
 RCSID
-    ("$Header: /cvs/openafs/src/viced/host.c,v 1.57.2.49 2007/09/07 03:55:40 shadow Exp $");
+    ("$Header: /cvs/openafs/src/viced/host.c,v 1.57.2.49.2.1 2007/12/13 20:55:42 shadow Exp $");
 
 #include <stdio.h>
 #include <errno.h>
@@ -1558,6 +1558,7 @@ h_GetHost_r(struct rx_connection *tcon)
                     host->interface ? uuid2 : ""));
 
            /* The host in the cache is not the host for this connection */
+            h_Lock_r(host);
            host->hostFlags |= HOSTDELETED;
            host->hostFlags &= ~HWHO_INPROGRESS;
            h_Unlock_r(host);

diff --git a/src/viced/viced.c b/src/viced/viced.c
index d785225afbd2bcfdefe0162076a0ed5d6cbc3b7d..45cd382ef26c3f64579ffcb94095c08fe916709f 100644 (file)
--- a/src/viced/viced.c
+++ b/src/viced/viced.c
@@ -20,7 +20,7 @@
 #include <afs/param.h>
 
 RCSID
-    ("$Header: /cvs/openafs/src/viced/viced.c,v 1.58.2.19 2007/01/12 05:23:44 shadow Exp $");
+    ("$Header: /cvs/openafs/src/viced/viced.c,v 1.58.2.19.2.1 2007/12/13 21:00:43 shadow Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -699,6 +699,9 @@ ShutDownAndCore(int dopanic)
        }
     }
 
+    if (dopanic)
+       assert(0);
+
     exit(0);
 
 }                              /*ShutDown */

diff --git a/src/vol/partition.c b/src/vol/partition.c
index 2aefc61f0f2722cc0fae978c59f7e0da993a1f27..4be5350fcae8fd5397bce94a4b1b0bf17f2f8e9e 100644 (file)
--- a/src/vol/partition.c
+++ b/src/vol/partition.c
@@ -21,7 +21,7 @@
 #include <afs/param.h>
 
 RCSID
-    ("$Header: /cvs/openafs/src/vol/partition.c,v 1.30.2.4 2007/05/10 22:44:12 shadow Exp $");
+    ("$Header: /cvs/openafs/src/vol/partition.c,v 1.30.2.4.2.1 2007/12/13 21:01:58 shadow Exp $");
 
 #include <ctype.h>
 #ifdef AFS_NT40_ENV
@@ -440,7 +440,7 @@ VAttachPartitions(void)
        /* but allow zfs too if we're in the NAMEI environment */
        if (
 #ifdef AFS_NAMEI_ENV
-           ((!(strcmp(mnt.mnt_fstype, "ufs") &&
+           (((strcmp(mnt.mnt_fstype, "ufs") &&
                strcmp(mnt.mnt_fstype, "zfs"))))
 #else
            (strcmp(mnt.mnt_fstype, "ufs") != 0)