Merge in trunk with 1.2.13-1

diff --git a/ChangeLog b/ChangeLog
index 4555645094376f36a71b7d6ce21fec6b68b0b93d..e3f6a3c9623ce721726ab3b94aeb2c05824d4834 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,119 @@
+2004-10-29 00:35  shadow
+
+       * configure-libafs.in, configure.in: DELTA openafs-1213-20041028
+       AUTHOR shadow@dementia.org FIXES
+       
+       make this version 1.2.13
+
+2004-10-29 00:35  shadow
+
+       * src/: WINNT/afsd/cm_conn.c, config/NTMakefile.i386_nt40,
+       libafsrpc/afsrpc.def: DELTA STABLE12-windows-20041028 AUTHOR
+       jaltman@secure-endpoints.com FIXES
+       
+       update 1.2.x to build on windows, at least
+
+2004-10-28 20:47  shadow
+
+       * src/viced/afsfileprocs.c: DELTA
+       STABLE12-inlinebulk-put-ref-on-error-20041028 AUTHOR
+       shadow@dementia.org FIXES
+       
+       if we got an error during InlineBulk, put back the reference
+
+2004-10-28 18:30  shadow
+
+       * src/viced/callback.c: DELTA
+       STABLE12-drop-h-lock-around-putconn-20041027 AUTHOR
+       shadow@dementia.org FIXES
+       
+       the problem with rx_PutConnection is h_FreeConnection uses the host
+       global lock but it shouldn't matter (callback conn should be a
+       client not server conn and thus not h_FreeConnection on cleanup)
+       
+       further, we should free the conns we GetConnection'd not the ones
+       still in the host struct at the end.
+
+2004-10-27 19:37  shadow
+
+       * src/viced/callback.c: DELTA
+       STABLE12-drop-h-lock-around-putconn-20041027 AUTHOR
+       shadow@dementia.org FIXES
+       
+       the problem with rx_PutConnection is h_FreeConnection uses the host
+       global lock
+
+2004-10-22 06:48  shadow
+
+       * configure-libafs.in, configure.in: DELTA openafs-1-2-12-20041022
+       AUTHOR shadow@dementia.org
+       
+       update configure scripts
+
+2004-10-21 15:01  shadow
+
+       * src/afs/LINUX/osi_vnodeops.c: DELTA
+       
+       fstracing on a linux machine and trying to fs flush a file in the
+       cache would tr igger a hang on a machine with SMP kernel. fix it.
+       STABLE12-fstrace-avoid-double-glock-in-dentry-code-during-fstrace-2
+       0040719 AUTHOR shadow@dementia.org FIXES
+
+2004-10-20 07:41  shadow
+
+       * src/viced/callback.c: DELTA
+       
+       since it looks like CheckHost is using a gc'd client conn, this
+       more or less has  to be it.
+       
+       and don't deadlock.
+       STABLE12-viced-callback-lock-host-during-multi-breakcallback-200410
+       11 AUTHOR shadow@dementia.org FIXES
+
+2004-10-18 06:38  shadow
+
+       * src/afs/DARWIN/osi_vnodeops.c: DELTA
+       STABLE12-darwin-updates-20040623 AUTHOR shadow@dementia.org FIXES
+       
+       this should be switched to use the freebsd style getnewvnode
+       
+       perhaps it will be
+
+2004-10-18 06:36  shadow
+
+       * src/viced/host.c: DELTA
+       STABLE12-findclient-print-stolen-clients-20040805 AUTHOR
+       shadow@dementia.org FIXES
+       
+       when a client is "stolen" due to a race, print it.
+
+2004-10-18 06:26  shadow
+
+       * src/vol/vol-salvage.c: DELTA
+       STABLE12-vol-fix-nuke-iteration-and-nuke-globals-20040928 AUTHOR
+       shadow@dementia.org
+       
+       allInodes global dies; don't use ti as an iterator right after
+       freeing it.
+
+2004-10-18 06:09  shadow
+
+       * src/afs/LINUX/osi_vnodeops.c: DELTA
+       STABLE12-linux-pagelaunder-avoid-deadlock-20041012 AUTHOR
+       jbuehler@hekimian.com FIXES 15239
+       
+       mmap'd files can deadlock on linux; fix by not letting kernel free
+       pages out of our space predictively
+
+2004-10-18 06:04  shadow
+
+       * src/afs/: afs_call.c, afs_osi.c, DARWIN/osi_prototypes.h,
+       DARWIN/osi_sleep.c: DELTA
+       STABLE12-darwin-afsdb-handler-signal-mask-20040728 AUTHOR
+       hollandp@umich.edu FIXES 6027
+       
+       mask signals on darwin so afsdb handler doesn't die
+
 2004-10-21 15:01  shadow
 
        * src/afs/LINUX/osi_vnodeops.c: DELTA

diff --git a/RELNOTES-1.2.13 b/RELNOTES-1.2.13
new file mode 100644 (file)
index 0000000..2f1a166
--- /dev/null
+++ b/RELNOTES-1.2.13
@@ -0,0 +1,17 @@
+                  OpenAFS Release Notes - Version 1.2.13
+     _________________________________________________________________
+All systems: Major bugfixes.
+     _________________________________________________________________
+
+* Bugfixes:
+
+All systems:
+
+- A fileserver bug where an Rx connection can be reclaimed while in use.
+
+- A fileserver bug where a reference to a volume could be leaked and later 
+  cause a deadlock as a result of a bulk status call
+
+- Reference counting of fileserver objects in unsigned 32 bit integers 
+  instead of signed 16 bit integers.
+

diff --git a/configure b/configure
index 032f6a9967c33edc851704032bc3323b08c569ed..7b8951371690c218b7c459ca08c32cc977250f5c 100755 (executable)
--- a/configure
+++ b/configure
@@ -1600,7 +1600,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=openafs
- VERSION=1.2.12
+ VERSION=1.2.13
 
 
 cat >>confdefs.h <<_ACEOF

diff --git a/configure-libafs b/configure-libafs
index 976a036e5d5d37f43479dd46dce38daa53fe04eb..86185373919ffa781a7a7146397f414c31659492 100755 (executable)
--- a/configure-libafs
+++ b/configure-libafs
@@ -1600,7 +1600,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=openafs-libafs
- VERSION=1.2.12
+ VERSION=1.2.13
 
 
 cat >>confdefs.h <<_ACEOF

diff --git a/configure-libafs.in b/configure-libafs.in
index f9740cbe4bce7e78c5f134ee3a81487ebbf36f8e..fc889232d8dde0edfeed293251bd7c5e4fab38d4 100644 (file)
--- a/configure-libafs.in
+++ b/configure-libafs.in
@@ -1,5 +1,5 @@
 AC_INIT(Makefile.common)
-AM_INIT_AUTOMAKE(openafs-libafs,1.2.12)
+AM_INIT_AUTOMAKE(openafs-libafs,1.2.13)
 AC_CONFIG_HEADER(config/afsconfig.h)
 define(OPENAFS_CONFIGURE_LIBAFS)
 

diff --git a/configure.in b/configure.in
index e9dc7ab91473bdfdf0d88ca8810346af59ef2be8..e84a2bdecd6e9d58d6d3f330bded00b7c0e158bf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(src/config/stds.h)
-AM_INIT_AUTOMAKE(openafs,1.2.12)
+AM_INIT_AUTOMAKE(openafs,1.2.13)
 AC_CONFIG_HEADER(src/config/afsconfig.h)
 
 AC_PROG_CC

diff --git a/debian/CellServDB b/debian/CellServDB
index b8e074352cc220de76a15cc4141fafaf79bc8733..f6a7c163aaf73ca4e02e006874624bb39cfab658 100644 (file)
--- a/debian/CellServDB
+++ b/debian/CellServDB
@@ -1,4 +1,4 @@
->grand.central.org      #GCO Public CellServDB 08 Dec 2003
+>grand.central.org      #GCO Public CellServDB 10 Oct 2004
 18.7.14.88                      #grand-opening.mit.edu
 128.2.191.224                   #penn.central.org
 >wu-wien.ac.at          #University of Economics, Vienna, Austria
@@ -27,12 +27,17 @@
 129.132.115.37                  #nethzafs-005.ethz.ch
 129.132.115.38                  #nethzafs-006.ethz.ch
 >psi.ch                 #Paul Scherrer Institut - Villigen, Switzerland
-129.129.16.10                   #afs1.psi.ch
-129.129.16.11                   #afs2.psi.ch
+129.129.190.140                 #afs00.psi.ch
+129.129.190.141                 #afs01.psi.ch
+129.129.190.142                 #afs02.psi.ch
 >extundo.com            #Simon Josefsson's cell
 195.42.214.241                  #slipsten.extundo.com
 >mekinok.com            #Mekinok, Inc.
 4.36.43.98                      #loggerhead.mekinok.com
+>membrain.com           #membrain.com
+66.93.118.125                   #stormy
+130.85.24.11                    #weasel
+130.85.24.13                    #straykitten
 >midnightlinux.com      #Midnight Linux, Pittsburgh PA
 66.93.62.18                     #romulus.midnihtlinux.com
 66.93.62.20                     #yar.midnightlinux.com
@@ -52,10 +57,10 @@
 141.34.22.10                    #romulus.ifh.de
 141.34.22.11                    #remus.ifh.de
 141.34.22.29                    #hekate.ifh.de
->lrz-muenchen.de        #Leibniz-Rechenzentrum Muenchen
+>lrz-muenchen.de        #Leibniz Computing Centre, Germany
 129.187.10.36                   #afs1.lrz-muenchen.de
-129.187.14.10                   #afs3.lrz-muenchen.de
-129.187.14.12                   #afs2.lrz-muenchen.de
+129.187.10.56                   #afs3.lrz-muenchen.de
+129.187.10.57                   #afs2.lrz-muenchen.de
 >ipp-garching.mpg.de    #Institut fuer Plasmaphysik
 130.183.9.5                     #afs-db1.rzg.mpg.de
 130.183.100.10                  #afs-db2.aug.ipp-garching.mpg.de
@@ -63,20 +68,30 @@
 >mpe.mpg.de             #MPE cell
 130.183.130.7                   #irafs1.mpe-garching.mpg.de
 130.183.134.20                  #irafs2.mpe-garching.mpg.de
+>i1.informatik.rwth-aachen.de #Informatik I, RWTH Aachen
+137.226.244.79                  #remus.informatik.rwth-aachen.de
 >tu-chemnitz.de         #Technische Universitaet Chemnitz, Germany
 134.109.2.1                     #zuse.hrz.tu-chemnitz.de
 134.109.2.15                    #phoenix.hrz.tu-chemnitz.de
 134.109.200.7                   #aetius.hrz.tu-chemnitz.de
->uni-bonn.de            #Cell name
+>e18.ph.tum.de          #Experimental Physics, TU Munich, Germany
+129.187.154.223                 #hamlet.e18.physik.tu-muenchen.de
+>uni-bonn.de            #University of Bonn, Computing Center
 131.220.14.198                  #work15-eth.rhrz.uni-bonn.de
-131.220.14.203                  #node03-en2.rhrz.uni-bonn.de
 131.220.14.205                  #node05.rhrz.uni-bonn.de
+131.220.15.197                  #afs-db1.rhrz.uni-bonn.de
+>atlass01.physik.uni-bonn.de #Bonn ATLAS
+131.220.165.43                  #atlass01.physik.uni-bonn.de
 >uni-freiburg.de        #Albert-Ludwigs-Universitat Freiburg
 132.230.6.235                   #sv6.ruf.uni-freiburg.de
 132.230.6.236                   #sv7.ruf.uni-freiburg.de
 132.230.6.237                   #sv8.ruf.uni-freiburg.de
 >physik.uni-freiburg.de #institute of physics, university Freiburg, Germany
 132.230.77.16                   #hepafs.physik.uni-freiburg.de
+>urz.uni-heidelberg.de  #Uni Heidelberg (Rechenzentrum)
+129.206.119.10                  #afsdb.urz.uni-heidelberg.de
+129.206.119.16                  #afsdb1.urz.uni-heidelberg.de
+129.206.119.17                  #afsdb2.urz.uni-heidelberg.de
 >uni-hohenheim.de       #University of Hohenheim
 144.41.2.2                      #rs13.serv.uni-hohenheim.de
 144.41.2.3                      #rs14.serv.uni-hohenheim.de
@@ -96,16 +111,23 @@
 >physik.uni-mainz.de    #institute of physics, university Mainz, Germany
 134.93.130.93                   #hardy.physik.uni-mainz.de
 >uni-mannheim.de        #Uni Mannheim (Rechenzentrum)
-134.155.50.165                  #afsdbx.uni-mannheim.de
-134.155.50.166                  #afsdby.uni-mannheim.de
-134.155.50.167                  #afsdbz.uni-mannheim.de
+134.155.97.204                  #afsdb1.uni-mannheim.de
+134.155.97.205                  #afsdb2.uni-mannheim.de
+134.155.97.206                  #afsdb3.uni-mannheim.de
 >physik.uni-wuppertal.de #Physics department of Bergische Universität Wuppertal
 132.195.104.3                   #afs1.physik.uni-wuppertal.de
 132.195.104.230                 #afs2.physik.uni-wuppertal.de
+>s-et.aau.dk            #Aalborg Univ., The Student Society, Denmark
+130.225.196.22                  #afs.s-et.aau.dk
 >ies.auc.dk             #Aalborg Univ., Inst. of Electronic Systems, Denmark
 130.225.51.73                   #afsdb1.kom.auc.dk
 130.225.51.74                   #afsdb2.kom.auc.dk
 130.225.51.85                   #afsdb3.kom.auc.dk
+>asu.edu                #Arizona State University
+129.219.10.69                   #authen2.asu.edu
+129.219.10.70                   #authen1.asu.edu
+129.219.10.72                   #authen3.asu.edu
+129.219.100.16                  #authen4.asu.edu
 >hep.caltech.edu        #CalTech High Energy Physics
 131.215.126.150                 #afs.hep.caltech.edu
 >andrew.cmu.edu         #Carnegie Mellon University - Computing Services Cell
@@ -115,19 +137,27 @@
 128.2.10.28                     #vice28.fs.andrew.cmu.edu
 128.2.32.44                     #new-vice12.fs.andrew.cmu.edu
 >club.cc.cmu.edu        #Carnegie Mellon University Computer Club
-128.2.4.131                     #yttrium.club.cc.cmu.edu
 128.2.4.132                     #zirconium.club.cc.cmu.edu
+128.2.4.181                     #yttrium.club.cc.cmu.edu
 >chem.cmu.edu           #Carnegie Mellon University - Chemistry Dept.
 128.2.40.134                    #afs.chem.cmu.edu
 128.2.40.140                    #afs2.chem.cmu.edu
 >cs.cmu.edu             #Carnegie Mellon University - School of Comp. Sci.
-128.2.206.130                   #cucumber.srv.cs.cmu.edu
-128.2.222.199                   #papaya.srv.cs.cmu.edu
-128.2.242.86                    #lemon.srv.cs.cmu.edu
+128.2.194.178                   #cherry.srv.cs.cmu.edu
+128.2.194.179                   #pumpkin.srv.cs.cmu.edu
+128.2.194.180                   #strawberry.srv.cs.cmu.edu
 >ece.cmu.edu            #Carnegie Mellon University - Elec. Comp. Eng. Dept.
 128.2.129.7                     #porok.ece.cmu.edu
 128.2.129.8                     #vicio.ece.cmu.edu
 128.2.129.9                     #e-xing.ece.cmu.edu
+>scotch.ece.cmu.edu     #CMU ECE CALCM research group
+128.2.134.82                    #lagavulin.ece.cmu.edu
+>qatar.cmu.edu          #Carnegie Mellon University - Qatar Campus Cell
+204.194.25.7                    #afs1.qatar.cmu.edu
+204.194.25.8                    #afs2.qatar.cmu.edu
+>sbp.ri.cmu.edu         #Carnegie Mellon University - Sensor Based Planning Lab
+128.2.105.174                   #voronoi.sbp.ri.cmu.edu
+128.2.105.175                   #nihao.sbp.ri.cmu.edu
 >msc.cornell.edu        #Cornell University Materials Science Center
 128.84.231.242                  #miranda.ccmr.cornell.edu
 128.84.241.35                   #co.ccmr.cornell.edu
@@ -136,13 +166,17 @@
 129.170.30.143                  #dbicafs1.dartmouth.edu
 129.170.30.144                  #dbicafs2.dartmouth.edu
 129.170.30.145                  #dbicafs3.dartmouth.edu
+>northstar.dartmouth.edu #Dartmouth College Research Computing
+129.170.16.22                   #halley.dartmouth.edu
+129.170.16.42                   #oort.dartmouth.edu
+129.170.16.43                   #cygnusx1.dartmouth.edu
 >iastate.edu            #Iowa State University
 129.186.1.243                   #afsdb-1.iastate.edu
 129.186.6.243                   #afsdb-2.iastate.edu
 129.186.142.243                 #afsdb-3.iastate.edu
 >athena.mit.edu         #MIT/Athena cell
 18.7.1.66                       #paris.mit.edu.
-18.145.0.25                     #agamemnon.mit.edu.
+18.7.1.74                       #chimera.mit.edu.
 18.158.0.37                     #prill.mit.edu.
 >dev.mit.edu            #MIT/IS Development cell
 18.7.1.70                       #wham.mit.edu.
@@ -173,6 +207,12 @@
 128.182.59.182                  #shaggy.psc.edu
 128.182.66.184                  #velma.psc.edu
 128.182.66.185                  #daphne.psc.edu
+>scoobydoo.psc.edu      #PSC Test Cell
+128.182.59.181                  #scooby.psc.edu
+>cede.psu.edu           #Penn State - Center for Engr. Design & Entrepeneurship
+146.186.218.10                  #greenly.cede.psu.edu
+146.186.218.60                  #b50.cede.psu.edu
+146.186.218.246                 #stalin.cede.psu.edu
 >rose-hulman.edu        #Rose-Hulman Institute of Technology
 137.112.7.11                    #afs1.rose-hulman.edu
 137.112.7.12                    #afs2.rose-hulman.edu
@@ -209,19 +249,19 @@
 >ncsa.uiuc.edu          #University of Illinois
 141.142.3.5                     #congo.ncsa.uiuc.edu
 141.142.3.8                     #nile.ncsa.uiuc.edu
-141.142.230.19                  #jinx.ncsa.uiuc.edu
+141.142.3.9                     #kaskaskia.ncsa.uiuc.edu
 >umbc.edu               #University of Maryland, Baltimore County
-130.85.1.13                     #db2.afs.umbc.edu
-130.85.6.33                     #db1.afs.umbc.edu
-130.85.60.12                    #db3.afs.umbc.edu
+130.85.24.23                    #db2.afs.umbc.edu
+130.85.24.87                    #db3.afs.umbc.edu
+130.85.24.101                   #db1.afs.umbc.edu
 >glue.umd.edu           #University of Maryland - Project Glue
-128.8.10.44                     #tin.umd.edu
-128.8.10.126                    #iron.umd.edu
-128.8.70.10                     #copper.umd.edu
+128.8.70.11                     #olmec.umd.edu
+128.8.236.4                     #egypt.umd.edu
+128.8.236.230                   #babylon.umd.edu
 >wam.umd.edu            #University of Maryland Network WAM Project
 128.8.70.9                      #csc-srv.wam.umd.edu
-128.8.73.9                      #pg2-srv.wam.umd.edu
-129.2.128.54                    #avw-srv.wam.umd.edu
+128.8.236.5                     #avw-srv.wam.umd.edu
+128.8.236.231                   #ptx-srv.wam.umd.edu
 >umich.edu              #University of Michigan - Campus
 141.211.1.32                    #fear.ifs.umich.edu
 141.211.1.33                    #surprise.ifs.umich.edu
@@ -234,8 +274,9 @@
 141.211.133.5                   #babylon.citi.umich.edu
 >lsa.umich.edu          #University of Michigan - College of LS&A
 141.211.54.132                  #curtis.admin.lsa.umich.edu
-141.211.61.23                   #zee.admin.lsa.umich.edu
-141.211.68.15                   #marshall.lsa.umich.edu
+141.211.211.53                  #gerow.lsa.umich.edu
+141.211.211.72                  #collines.lsa.umich.edu
+141.211.211.153                 #hodges.lsa.umich.edu
 >math.lsa.umich.edu     #University of Michigan - Math Department
 141.211.61.40                   #ike.math.lsa.umich.edu
 141.211.61.41                   #clark.math.lsa.umich.edu
@@ -248,15 +289,23 @@
 152.2.5.2                       #valerian.physics.unc.edu
 152.2.5.3                       #augustus.physics.unc.edu
 152.2.7.67                      #nerva.astro.unc.edu
+>uncc.edu               #University of NC at Charlotte Mosaic AFS Cell
+152.15.10.70                    #as-sm1.uncc.edu
+152.15.13.7                     #as-sm2.uncc.edu
+152.15.30.27                    #fs-kenn3.uncc.edu
 >eng.utah.edu           #University of Utah - Engineering
-155.99.222.40                   #afs1.eng.utah.edu
-155.99.222.41                   #afs2.eng.utah.edu
+155.99.222.9                    #lenny.eng.utah.edu
+155.99.222.10                   #carl.eng.utah.edu
 >cs.uwm.edu             #University of Wisconsin--Milwaukee
 129.89.38.124                   #solomons.cs.uwm.edu
 >cs.wisc.edu            #Univ. of Wisconsin-Madison, Computer Sciences Dept.
 128.105.132.14                  #timon.cs.wisc.edu
 128.105.132.15                  #pumbaa.cs.wisc.edu
 128.105.132.16                  #zazu.cs.wisc.edu
+>engr.wisc.edu          #University of Wisconsin-Madison, College of Engineering
+144.92.13.14                    #larry.cae.wisc.edu
+144.92.13.15                    #curly.cae.wisc.edu
+144.92.13.16                    #moe.cae.wisc.edu
 >hep.wisc.edu           #University of Wisconsin -- High Energy Physics
 128.104.28.219                  #anise.physics.wisc.edu
 >physics.wisc.edu       #Univ. of Wisconsin-Madison, Physics Department
@@ -299,6 +348,8 @@
 128.55.128.250                  #mars.nersc.gov
 128.55.128.252                  #alfred.nersc.gov
 128.55.128.254                  #lurch.nersc.gov
+>bme.hu                 #Budapest University of Technology and Economics
+152.66.241.81                   #dugo.iit.bme.hu
 >caspur.it              #CASPUR Inter-University Computing Consortium, Rome
 193.204.5.45                    #pomodoro.caspur.it
 193.204.5.46                    #banana.caspur.it
@@ -307,10 +358,12 @@
 192.107.90.2                    #fusafs1.frascati.enea.it
 192.107.90.3                    #fusafs2.frascati.enea.it
 192.107.90.4                    #fusafs3.frascati.enea.it
+>icemb.it               #ICEMB, Universita' La Sapienza - Rome - Italy
+193.204.6.130                   #icembfs.caspur.it
 >infn.it                #Istituto Nazionale di Fisica Nucleare (INFN), Italia
-131.154.1.7                     #afscnaf.infn.it
-141.108.3.252                   #afsrm1.roma1.infn.it
-192.84.134.75                   #afsna.na.infn.it
+131.154.1.7                     #afs3.infn.it
+141.108.3.252                   #afs1.infn.it
+192.84.134.75                   #afs2.infn.it
 >kloe.infn.it           #INFN, KLOE experiment at Laboratori di Frascati
 192.135.25.111                  #kloeafs1.lnf.infn.it
 192.135.25.112                  #kloeafs2.lnf.infn.it
@@ -324,25 +377,22 @@
 >lngs.infn.it           #INFN, Laboratori Nazionali di Gran Sasso
 192.84.135.21                   #rsgs05.lngs.infn.it
 >pi.infn.it             #INFN, Sezione di Pisa
-192.84.133.7                    #aix.pi.infn.it
+131.114.134.26                  #unknownhost.pi.infn.it
 192.84.133.50                   #aix1.pi.infn.it
 >psm.it                 #Progetto San Marco, Universita' di Roma-1
 151.100.1.65                    #atlante.psm.uniroma1.it
+>tgrid.it               #CASPUR-CILEA-CINECA Grid Cell
+193.204.5.33                    #cccgrid.caspur.it
 >ictp.trieste.it        #The Abdus Salam International Centre for Theoretical Physics (IC
 140.105.16.8                    #fs1.ictp.trieste.it
 140.105.16.9                    #fs2.ictp.trieste.it
->dis.uniroma1.it        #Universita' La Sapienza, Dept. of Inf. and Sys.
-151.100.5.21                    #peano.dis.uniroma1.it
->dsi.uniroma1.it        #Universita' La Sapienza, Dept. of Computer Science
-151.100.17.2                    #afscinfo.dsi.uniroma1.it
 >ing.uniroma1.it        #Universita' La Sapienza, Fac. Ingeneria
-151.100.39.30                   #delta.ing.uniroma1.it
-151.100.85.209                  #beta.ing.uniroma1.it
+151.100.85.253                  #alfa.ing.uniroma1.it
 >vn.uniroma3.it         #University of Rome 3, Area Vasca Navale
 193.204.161.136                 #alfa.dia.uniroma3.it
 193.204.161.137                 #beta.dia.uniroma3.it
 193.204.161.138                 #gamma.dia.uniroma3.it
->italia                 #Italian Public AFS Cell
+>italia                 #Italian public AFS cell
 193.204.5.9                     #afs.caspur.it
 >cmf.nrl.navy.mil       #Naval Research Lab - CCS
 134.207.10.68                   #picard.cmf.nrl.navy.mil
@@ -356,7 +406,9 @@
 198.128.3.21                    #fs1.es.net
 198.128.3.22                    #fs2.es.net
 198.128.3.23                    #fs3.es.net
->dev.sinenomine.net     #Sine Nomine Associates
+>laroia.net             #Laroia Networks
+66.66.102.254                   #supercore.laroia.net
+>sinenomine.net         #Sine Nomine Associates
 66.92.236.139                   #afs.sinenomine.net
 >slackers.net           #The Slackers' Network
 63.201.48.27                    #alexandria.slackers.net
@@ -373,13 +425,19 @@
 >dementia.org           #Dementia Unlimited
 128.2.12.45                     #alycia.dementia.org
 128.2.120.216                   #meredith.dementia.org
+>firelion.org           #firelion.org
+24.28.77.209                    #sirius.firelion.org
+>hackish.org            #Hackish.org
+24.167.65.213                   #avatar.sys.hackish.org
+128.2.120.138                   #kurma.sys.hackish.org
 >idahofuturetruck.org   #University of Idaho hybrid vehicle development
 12.18.238.210                   #dsle210.fsr.net
 >nimlabs.org            #Nimlabs, Ink. Cell.
 18.238.1.103                    #olfin.nimlabs.org
 18.238.1.105                    #caerbanog.nimlabs.org
 >nomh.org               #nomh.org
-205.201.8.44                    #gamma.nomh.org
+204.29.154.12                   #iota.nomh.org
+204.29.154.32                   #adversity.xi.nomh.org
 >oc7.org                #The OC7 Project
 128.2.6.107                     #vice3.oc7.org
 128.2.122.140                   #vice2.oc7.org
@@ -436,6 +494,7 @@
 >su.se                  #Stockholm University
 130.237.162.81                  #afsdb1.su.se
 130.237.162.82                  #afsdb2.su.se
+130.237.162.230                 #afsdb3.su.se
 >f9.ijs.si              #F9, Jozef Stefan Institue
 194.249.156.1                   #brenta.ijs.si
 >p-ng.si                #Nova Gorica Polytechnic

diff --git a/debian/changelog b/debian/changelog
index 918851fefdeeebf1ac9850bce68eeb4a6b2157d7..96291a723a67eeff4778bf38fa1029eef867a76d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,11 @@
-openafs (1.2.12-0woody1) unstable; urgency=medium
+openafs (1.2.13-0woody1) unstable; urgency=high
+
+  * New CellServDB
+  * New upstream version.
+
+ -- Sam Hartman <hartmans@debian.org>  Tue,  2 Nov 2004 15:42:15 -0500
+
+openafs (1.2.12-1) unstable; urgency=medium
 
   * New upstream version
   * Medium urgency because this version fixes a significant server crash

diff --git a/debian/openafs-client.docs b/debian/openafs-client.docs
index 79b2a31613137651e417605ba7ed3b9cbac6a8a3..d5505e1256d0fee68874621ed8153a7416d121b7 100644 (file)
--- a/debian/openafs-client.docs
+++ b/debian/openafs-client.docs
@@ -1,4 +1,5 @@
 README
+RELNOTES-1.2.13
 debian/README.servers
 debian/configuration-transcript.txt
 debian/README.modules

diff --git a/src/WINNT/afsd/cm_conn.c b/src/WINNT/afsd/cm_conn.c
index 6ebdf65221f75f12659b3974745256623985998d..c597c79d2e44ca59d0b871699802c33fec64ae01 100644 (file)
--- a/src/WINNT/afsd/cm_conn.c
+++ b/src/WINNT/afsd/cm_conn.c
@@ -174,8 +174,7 @@ cm_Analyze(cm_conn_t *connp, cm_user_t *userp, cm_req_t *reqp,
                int same;
 
                /* Log server being offline for this volume */
-               osi_Log4(afsd_logp, "cm_Analyze found server %d.%d.%d.%d
-marked offline for a volume",
+               osi_Log4(afsd_logp, "cm_Analyze found server %d.%d.%d.%d marked offline for a volume",
                         ((serverp->addr.sin_addr.s_addr & 0xff)),
                         ((serverp->addr.sin_addr.s_addr & 0xff00)>> 8),
                         ((serverp->addr.sin_addr.s_addr & 0xff0000)>> 16),

diff --git a/src/config/NTMakefile.i386_nt40 b/src/config/NTMakefile.i386_nt40
index 247a00ded5a3d24d2e01e3a514fd6baaed079a79..45f0564effbab1ab6a43edade65072ba5398e8c4 100644 (file)
--- a/src/config/NTMakefile.i386_nt40
+++ b/src/config/NTMakefile.i386_nt40
@@ -33,12 +33,12 @@
 # Allow them to be overriden in an NTMakefile or via an environment variable.
 
 !IFNDEF APPVER
-APPVER = 4.0
+APPVER = 5.0
 !ENDIF
 
 #define used in WinNT/2000 installation and program version display
-AFSPRODUCT_VERSION=1.2.10
-AFSPRODUCT_FILE_VERSION=1,2,1000,0
+AFSPRODUCT_VERSION=1.2.13
+AFSPRODUCT_FILE_VERSION=1,2,1300,0
 CELLNAME_DEFAULT=openafs.org
 CELLSERVDB_INSTALL=CellServDB.GrandCentral
 CELLSERVDB_WEB=http://grand.central.org/dl/cellservdb/CellServDB
@@ -139,7 +139,8 @@ afscdefs =\
        -I$(DESTDIR)\include\rx \
        -DWIN32_LEAN_AND_MEAN \
        -DSTRICT \
-       -D_WIN32_IE=0x0400 \
+       -D_WIN32_IE=0x0500 \
+        -D_WIN32_WINNT=0x0500 \
      -DAFS_AFSDB_ENV \
      -DAFS_FREELANCE_CLIENT
 
@@ -260,13 +261,13 @@ mfcdlllflags = $(mfcdlllflags) /NODEFAULTLIB:msvcrt.lib
 EXECONLINK = $(link) /OUT:$@ $(ldebug) $(conlflags) $(afslflags) $(conlibsdll) version.lib $**
 
 # EXE link macro for GUI applications
-EXEGUILINK = $(link) /OUT:$@ $(ldebug) $(guilflags) $(afslflags) $(guilibsdll) $**
+EXEGUILINK = $(link) /OUT:$@ $(ldebug) $(guilflags) $(afslflags) $(guilibsdll) version.lib $**
 
 # EXE link macro for MFC applications
-EXEMFCLINK = $(link) /OUT:$@ $(ldebug) $(mfclflags) $(afslflags) $(mfclibsdll) $**
+EXEMFCLINK = $(link) /OUT:$@ $(ldebug) $(mfclflags) $(afslflags) $(mfclibsdll) version.lib  $**
 
 # DLL link macro for console applications
-DLLCONLINK = $(link) /OUT:$@ $(ldebug) $(dlllflags) $(afslflags) $(conlibsdll) $**
+DLLCONLINK = $(link) /OUT:$@ $(ldebug) $(dlllflags) $(afslflags) $(conlibsdll) version.lib $**
 
 # DLL link macro for GUI applications
 !IF ("$(AFSDEV_BUILDTYPE)" == "CHECKED")

diff --git a/src/libafsrpc/afsrpc.def b/src/libafsrpc/afsrpc.def
index 3227b7c2bc562c2b2eca7788be97eee7ea73d0a2..692e9130889381e6b1b85ed5fc3e5a96182c89e4 100644 (file)
--- a/src/libafsrpc/afsrpc.def
+++ b/src/libafsrpc/afsrpc.def
@@ -198,4 +198,5 @@ EXPORTS
        rx_enable_hot_thread                    @203 DATA
        xdr_int64                               @204
        xdr_uint64                              @205
-       osi_AssertFailU                         @206
+               osi_AssertFailU                         @206
+        rx_GetConnection                        @207

diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c
index 6d635327037b190657920178aae181a98bd6cb57..671a8f3fddff8331897d703cbb8300dc4f40e5ca 100644 (file)
--- a/src/viced/afsfileprocs.c
+++ b/src/viced/afsfileprocs.c
@@ -28,7 +28,8 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-RCSID("$Header: /tmp/cvstemp/openafs/src/viced/afsfileprocs.c,v 1.1.1.15 2003/04/13 19:08:12 hartmans Exp $");
+RCSID("$Header: /cvs/openafs/src/viced/afsfileprocs.c,v 1.10.2.13 2004/10/28 20:47:00 shadow Exp $");
+
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -1064,6 +1065,7 @@ SRXAFS_InlineBulkStatus(tcon, Fids, OutStats, CallBacks, Sync)
                             READ_LOCK, &rights, &anyrights)) {
            tstatus = &OutStats->AFSBulkStats_val[i];
            tstatus->errorCode = errorCode;
+           PutVolumePackage(parentwhentargetnotdir, targetptr, (Vnode *) 0, volptr);
            parentwhentargetnotdir = (Vnode *) 0;
            targetptr = (Vnode *) 0;
            volptr = (Volume *) 0;

diff --git a/src/viced/callback.c b/src/viced/callback.c
index 2615f31f106ef04f61588ffc8b409cd3bbe07b83..5ed03efb5e966bc25a800d7813c6cbc42e95fe92 100644 (file)
--- a/src/viced/callback.c
+++ b/src/viced/callback.c
@@ -82,7 +82,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-RCSID("$Header: /cvs/openafs/src/viced/callback.c,v 1.6.2.11 2004/10/20 07:41:29 shadow Exp $");
+RCSID("$Header: /cvs/openafs/src/viced/callback.c,v 1.6.2.13 2004/10/28 18:30:06 shadow Exp $");
 
 #include <stdio.h> 
 #include <stdlib.h>      /* for malloc() */
@@ -844,12 +844,21 @@ static void MultiBreakCallBack_r(cba, ncbas, afidp, xhost)
     struct host *hp;
     hp = cba[i].hp;
     if (hp && xhost != hp) {
-      rx_PutConnection(hp->callback_rxcon);
       h_Release_r(hp);
     }
   }
 
-return ;
+  /* H_UNLOCK around this so h_FreeConnection does not deadlock.
+     h_FreeConnection should *never* be called on a callback connection,
+     but on 10/27/04 a deadlock occurred where it was, when we know why,
+     this should be reverted. -- shadow */
+  H_UNLOCK;
+  for (i = 0; i < j; i++) {
+      rx_PutConnection(conns[i]);
+  }
+  H_LOCK;
+
+  return ;
 }
 
 /*