Patches from kcr to fix dependencies and pull in stuff from cvs head

diff --git a/debian/changelog b/debian/changelog
index c10edab26766cb2ccf4c52ad3183ccf2a8287f68..ea65c53e762a96538e1449ccffc57ed1ca63f95f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,16 @@
-openafs (1.3.79-1) unstable; urgency=low
+openafs (1.3.79-1) UNRELEASED; urgency=low
 
   * New upstream version
         - Works with 2.6.10, Closes: #296835
   * Use amd64 not x86_64 for sysname script, Closes: #296855
+  * Patches from kcr
+      - Loosen dependencies for client and modules
+      - Enable debugging
+      - Some callbacks later stuff and fix short bitfield
+      - Fix permissions on /etc/openafs/server-local
+  
 
- -- Sam Hartman <hartmans@debian.org>  Wed, 23 Feb 2005 19:27:56 -0500
+ -- Sam Hartman <hartmans@debian.org>  Mon,  4 Apr 2005 00:04:21 -0400
 
 openafs (1.3.77-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index e970b030c00b602117f95d7ab98b5ae2c7d2997d..e1bdc73370bb62f7b22ae5b54d2186e71bc4f037 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Description: The AFS distributed filesystem- client support
 Package: openafs-kpasswd
 Priority: extra
 Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64
-Depends: ${shlibs:Depends}, openafs-client (= ${Source-Version})
+Depends: ${shlibs:Depends}, openafs-client
 Conflicts: krb5-user, heimdal-clients, kerberos4kth-clients
 Description: The AFS distributed filesystem- old password changing
  AFS is a distributed filesystem allowing cross-platform sharing of
@@ -34,7 +34,7 @@ Description: The AFS distributed filesystem- old password changing
 
 Package: openafs-fileserver
 Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64
-Depends: ${shlibs:Depends}, debconf, openafs-client (= ${Source-Version})
+Depends: ${shlibs:Depends}, debconf, openafs-client
 Recommends: ntp
 Description: The AFS distributed filesystem- file server
  AFS is a distributed filesystem allowing cross-platform sharing of
@@ -46,7 +46,7 @@ Description: The AFS distributed filesystem- file server
 
 Package: openafs-dbserver
 Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64
-Depends: ${shlibs:Depends}, debconf, openafs-fileserver (= ${Source-Version}), openafs-client (= ${Source-Version}), perl5
+Depends: ${shlibs:Depends}, debconf, openafs-fileserver, openafs-client, perl5
 Conflicts: openafs-ptutil
 Replaces: openafs-ptutil
 Provides: openafs-ptutil

diff --git a/debian/control.module b/debian/control.module
index 2c175bad6b55f77d2c8fd03eecfc089c11211f4d..c72c5a6eda076e8602657509342f12df5440e5f7 100644 (file)
--- a/debian/control.module
+++ b/debian/control.module
@@ -5,7 +5,7 @@ Maintainer: Sam Hartman <hartmans@debian.org>
 Standards-Version: 3.1.1
 
 Package: openafs-modules-=KVERS
-Conflicts: openafs-client (<< 1.3.64)
+Conflicts: openafs-client (<< 1.2.9)
 Provides: openafs-modules2
 Architecture: any
 Description: The AFS distributed filesystem- Kernel Module

diff --git a/debian/control.module-image b/debian/control.module-image
index fca77aa9a9ca79cd5386cbc05a85643ed82b501d..f1aaf33926107b937af0bfc7a857db465420b342 100644 (file)
--- a/debian/control.module-image
+++ b/debian/control.module-image
@@ -5,7 +5,7 @@ Maintainer: Sam Hartman <hartmans@debian.org>
 Standards-Version: 3.1.1
 
 Package: openafs-modules-=KVERS
-Conflicts: openafs-client (<< 1.3.64)
+Conflicts: openafs-client (<< 1.2.9)
 Provides: openafs-modules2
 Architecture: any
 Recommends: kernel-image-=KVERS (= =KREVS)

diff --git a/debian/rules b/debian/rules
index 4b4f15a1e136ba8b474c9ab1b13df48a20932e17..2d583aa1f381dba4481ffce02e86ec491aafc4f3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -39,7 +39,7 @@ configure-stamp:
         afslogsdir=/var/log/openafs sh configure --with-afs-sysname=$(SYS_NAME) --disable-kernel-module \
        --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
        --localstatedir=/var/lib  afslocaldir=/etc/openafs/server-local \
-       --enable-supergroups --enable-largefile-fileserver
+       --enable-supergroups --enable-largefile-fileserver --enable-debug
        chmod a+x src/libafs/make_kbuild_makefile.pl         
        install -d $(SYS_NAME)/dest/root.client/usr/vice/etc
        install -d dest/root.server/usr/afs/bin
@@ -101,6 +101,8 @@ install: build
        # No, includes should not have the x bit set
        find debian/libopenafs-dev/usr/include -type f -print | \
                xargs chmod a-x
+       # bos gets annoyed if the partitions on /etc/openafs/server-local are too liberal
+       chmod 700 debian/openafs-fileserver/etc/openafs/server-local
 
 # Build architecture-independent files here.
 # Pass -i to all debhelper commands in this target to reduce clutter.

diff --git a/src/afs/SUNOS/osi_inode.h b/src/afs/SUNOS/osi_inode.h
index 09b38b09ab09dfbf2cd89376433f8da430759250..a55f44dba50ff0c615536e9be126041b309c6ba3 100644 (file)
--- a/src/afs/SUNOS/osi_inode.h
+++ b/src/afs/SUNOS/osi_inode.h
@@ -1 +1 @@
-#error kernel code not supported on SunOS 4 \r
+#error kernel code not supported on SunOS 4 

diff --git a/src/rx/SUNOS/rx_kmutex.h b/src/rx/SUNOS/rx_kmutex.h
index fcb0b168a54da7f413356ae015e66fcaf3ee4518..89b35272a6cde927d68d3020f71999fab01d2dc9 100644 (file)
--- a/src/rx/SUNOS/rx_kmutex.h
+++ b/src/rx/SUNOS/rx_kmutex.h
@@ -1 +1 @@
-#error kernel code not supported on SunOS 4\r
+#error kernel code not supported on SunOS 4

diff --git a/src/rx/SUNOS/rx_knet.c b/src/rx/SUNOS/rx_knet.c
index 09b38b09ab09dfbf2cd89376433f8da430759250..a55f44dba50ff0c615536e9be126041b309c6ba3 100644 (file)
--- a/src/rx/SUNOS/rx_knet.c
+++ b/src/rx/SUNOS/rx_knet.c
@@ -1 +1 @@
-#error kernel code not supported on SunOS 4 \r
+#error kernel code not supported on SunOS 4 

diff --git a/src/viced/callback.c b/src/viced/callback.c
index 3acbc5184d27afcd1ff35130b900c4cae27fe142..2ea4f5c3638f80e23c0a674fa2d69fec44856f2b 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.5 2005/01/31 04:10:43 shadow Exp $");
+    ("$Header: /cvs/openafs/src/viced/callback.c,v 1.55.2.7 2005/02/25 19:50:25 shadow Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>            /* for malloc() */
@@ -328,7 +328,7 @@ FindFE(register AFSFid * fid)
     for (fei = HashTable[hash]; fei; fei = fe->fnext) {
        fe = itofe(fei);
        if (fe->volid == fid->Volume && fe->unique == fid->Unique
-           && fe->vnode == fid->Vnode)
+           && fe->vnode == fid->Vnode && fe->status != FE_LATER)
            return fe;
     }
     return 0;
@@ -697,6 +697,7 @@ AddCallBack1_r(struct host *host, AFSFid * fid, afs_uint32 * thead, int type,
        fe->vnode = fid->Vnode;
        fe->unique = fid->Unique;
        fe->ncbs = 0;
+       fe->status = 0;
        hash = VHash(fid->Volume, fid->Unique);
        fe->fnext = HashTable[hash];
        HashTable[hash] = fetoi(fe);
@@ -720,6 +721,11 @@ AddCallBack1_r(struct host *host, AFSFid * fid, afs_uint32 * thead, int type,
            TDel(cb);
            TAdd(cb, Thead);
        }
+       if (newfe == NULL) {    /* we are using the new FE */
+            fe->firstcb = cbtoi(cb);
+            fe->ncbs++;
+            cb->fhead = fetoi(fe);
+        }
     } else {
        cb = newcb;
        newcb = NULL;
@@ -1421,6 +1427,7 @@ BreakLaterCallBacks(void)
     struct host *host;
     struct VCBParams henumParms;
     unsigned short tthead = 0; /* zero is illegal value */
+    char hoststr[16];
 
     /* Unchain first */
     ViceLog(25, ("Looking for FileEntries to unchain\n"));
@@ -1460,16 +1467,23 @@ BreakLaterCallBacks(void)
     for (fe = myfe; fe;) {
        register struct CallBack *cbnext;
        for (cb = itocb(fe->firstcb); cb; cb = cbnext) {
-           host = h_itoh(cb->hhead);
-           h_Hold_r(host);
            cbnext = itocb(cb->cnext);
-           if (!tthead || (TNorm(tthead) < TNorm(cb->thead))) {
-               tthead = cb->thead;
+           host = h_itoh(cb->hhead);
+           if (cb->status == CB_DELAYED) {
+               h_Hold_r(host);
+               if (!tthead || (TNorm(tthead) < TNorm(cb->thead))) {
+                   tthead = cb->thead;
+               }
+               TDel(cb);
+               HDel(cb);
+               CDel(cb, 0);    /* Don't let CDel clean up the fe */
+               /* leave hold for MultiBreakVolumeCallBack to clear */
+           } else {
+               ViceLog(125,
+                       ("Found host %s:%d non-DELAYED cb for %u:%u:%u\n", 
+                        afs_inet_ntoa_r(host->host, hoststr),
+                        ntohs(host->port), fe->vnode, fe->unique, fe->volid));
            }
-           TDel(cb);
-           HDel(cb);
-           CDel(cb, 0);        /* Don't let CDel clean up the fe */
-           /* leave hold for MultiBreakVolumeCallBack to clear */
        }
        myfe = fe;
        fe = (struct FileEntry *)((struct object *)fe)->next;

diff --git a/src/viced/host.h b/src/viced/host.h
index 598b0ae965d9aef77bbb6302156b1538286ce260..c6fbfcf41a10c969c2d8f40b64ca441e26f4d9db 100644 (file)
--- a/src/viced/host.h
+++ b/src/viced/host.h
@@ -66,7 +66,7 @@ struct host {
                                 * byte order */
     unsigned short port;       /* port address of host */
     char Console;              /* XXXX This host is a console */
-    char hostFlags;            /*  bit map */
+    short hostFlags;           /*  bit map */
 #if FS_STATS_DETAILED
     char InSameNetwork;                /*Is host's addr in the same network as
                                 * the File Server's? */

diff --git a/src/vol/vol-salvage.c b/src/vol/vol-salvage.c
index 3066720c647447a08629f3d9adde7b968460a38b..3cbdd22b513ebfb07253b849eb4583349aaf91b0 100644 (file)
--- a/src/vol/vol-salvage.c
+++ b/src/vol/vol-salvage.c
@@ -2066,7 +2066,8 @@ DoSalvageVolumeGroup(register struct InodeSummary *isp, int nVols)
                ip->linkCount++;
            }
 
-          Log("%d inodes to process\n",totalInodes); 
+           if (totalInodes % 10000 == 0)
+               Log("%d inodes to process\n",totalInodes); 
        }
 #ifdef AFS_NAMEI_ENV
        while (dec_VGLinkH > 0) {