From: Russ Allbery Date: Tue, 18 Dec 2007 00:11:15 +0000 (+0000) Subject: Import upstream 1.4.6 release. X-Git-Tag: upstream/1.4.6.dfsg1 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=66b16364ca1126be6871a77f6f651bda084a78f4;p=packages%2Fo%2Fopenafs.git Import upstream 1.4.6 release. --- diff --git a/configure b/configure index e62e8d70d..917e0a087 100644 --- 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 39092b039..e65bc9a6b 100644 --- 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 8c211b0ee..7c24361aa 100644 --- 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 350778c58..ba72e0a37 100644 --- 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 d4308ad76..31dce6346 100644 --- a/src/viced/afsfileprocs.c +++ b/src/viced/afsfileprocs.c @@ -29,7 +29,7 @@ #include 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 #include @@ -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 66f674e22..ecc017f58 100644 --- a/src/viced/callback.c +++ b/src/viced/callback.c @@ -83,7 +83,7 @@ #include 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 #include /* 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 25ce9907f..d9d1e2ebd 100644 --- a/src/viced/host.c +++ b/src/viced/host.c @@ -11,7 +11,7 @@ #include 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 #include @@ -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 d785225af..45cd382ef 100644 --- a/src/viced/viced.c +++ b/src/viced/viced.c @@ -20,7 +20,7 @@ #include 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 #include @@ -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 2aefc61f0..4be5350fc 100644 --- a/src/vol/partition.c +++ b/src/vol/partition.c @@ -21,7 +21,7 @@ #include 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 #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)