From: Sam Hartman Date: Tue, 11 Sep 2001 14:23:06 +0000 (+0000) Subject: Back out patches applied upstream X-Git-Tag: debian/1.2.0-1~14 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=c3bee07c942a2eca6b0ebf8a78c2893512a662b4;p=packages%2Fo%2Fopenafs.git Back out patches applied upstream --- diff --git a/debian/patch.002_viced_debugging b/debian/patch.002_viced_debugging deleted file mode 100644 index 1a5dbba01..000000000 --- a/debian/patch.002_viced_debugging +++ /dev/null @@ -1,28 +0,0 @@ -Index: src/viced//afsfileprocs.c -=================================================================== -RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/viced/afsfileprocs.c,v -retrieving revision 1.1.1.6 -diff -u -r1.1.1.6 afsfileprocs.c ---- src/viced//afsfileprocs.c 14 Jul 2001 22:24:45 -0000 1.1.1.6 -+++ src/viced//afsfileprocs.c 20 Jul 2001 09:56:14 -0000 -@@ -6403,16 +6403,16 @@ - rc = IH_DEC(V_linkHandle(volptr), ino, - V_parentId(volptr)); - if (!rc ) { -- ViceLog(0,("CopyOnWrite failed: volume %u in partition %s needs salvage\n", -- V_id(volptr), volptr->partition->name)); -+ ViceLog(0,("CopyOnWrite failed: error %u after i_dec on disk full, volume %u in partition %s needs salvage\n", -+ rc, V_id(volptr), volptr->partition->name)); - VTakeOffline (volptr); - } - free(buff); - return ENOSPC; - } - else { -- ViceLog(0,("CopyOnWrite failed: volume %u in partition %s needs salvage\n", -- V_id(volptr), volptr->partition->name)); -+ ViceLog(0,("CopyOnWrite failed: volume %u in partition %s (tried reading %u, read %u, wrote %u, errno %u) volume needs salvage\n", -+ V_id(volptr), volptr->partition->name, length, rdlen, wrlen, errno)); - /* Decrement this inode so salvager doesn't find it. */ - FDH_REALLYCLOSE(newFdP); - IH_RELEASE(newH); diff --git a/debian/patch.003_rx_packet_client_only b/debian/patch.003_rx_packet_client_only deleted file mode 100644 index d9ba23ab5..000000000 --- a/debian/patch.003_rx_packet_client_only +++ /dev/null @@ -1,59 +0,0 @@ -Index: src/rx/rx_packet.c -=================================================================== -RCS file: /cvs/openafs/src/rx/rx_packet.c,v -retrieving revision 1.9 -retrieving revision 1.11 -diff -u -r1.9 -r1.11 ---- src/rx/rx_packet.c 2001/07/12 19:58:56 1.9 -+++ src/rx/rx_packet.c 2001/07/21 07:07:51 1.11 -@@ -1112,6 +1112,17 @@ - afs_int32 tl; - struct rx_serverQueueEntry *np, *nqe; - -+ /* -+ * Only respond to client-initiated Rx debug packets, -+ * and clear the client flag in the response. -+ */ -+ if (ap->header.flags & RX_CLIENT_INITIATED) { -+ ap->header.flags = ap->header.flags & ~RX_CLIENT_INITIATED; -+ rxi_EncodePacketHeader(ap); -+ } else { -+ return ap; -+ } -+ - rx_packetread(ap, 0, sizeof(struct rx_debugIn), (char *)&tin); - /* all done with packet, now set length to the truth, so we can - * reuse this packet */ -@@ -1384,13 +1395,27 @@ - register struct rx_packet *ap; - int istack; - { -- afs_int32 tl; -- rx_packetwrite(ap, 0, 65, cml_version_number+4); -- tl = ap->length; -+ afs_int32 tl; -+ -+ /* -+ * Only respond to client-initiated version requests, and -+ * clear that flag in the response. -+ */ -+ if (ap->header.flags & RX_CLIENT_INITIATED) { -+ char buf[66]; -+ -+ ap->header.flags = ap->header.flags & ~RX_CLIENT_INITIATED; -+ rxi_EncodePacketHeader(ap); -+ bzero(buf, sizeof(buf)); -+ strncpy(buf, cml_version_number+4, sizeof(buf)-1); -+ rx_packetwrite(ap, 0, 65, buf); -+ tl = ap->length; - ap->length = 65; - rxi_SendDebugPacket(ap, asocket, ahost, aport, istack); -- ap->length = tl; -- return ap; -+ ap->length = tl; -+ } -+ -+ return ap; - } - - diff --git a/src/rx/rx_packet.c b/src/rx/rx_packet.c index 57effc598..7f54733dc 100644 --- a/src/rx/rx_packet.c +++ b/src/rx/rx_packet.c @@ -14,7 +14,7 @@ #include #endif -RCSID("$Header: /tmp/cvstemp/openafs/src/rx/rx_packet.c,v 1.3 2001/07/21 16:45:40 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/rx/rx_packet.c,v 1.4 2001/09/11 14:23:02 hartmans Exp $"); #ifdef KERNEL #if defined(UKERNEL) @@ -1112,17 +1112,6 @@ struct rx_packet *rxi_ReceiveDebugPacket(ap, asocket, ahost, aport, istack) afs_int32 tl; struct rx_serverQueueEntry *np, *nqe; - /* - * Only respond to client-initiated Rx debug packets, - * and clear the client flag in the response. - */ - if (ap->header.flags & RX_CLIENT_INITIATED) { - ap->header.flags = ap->header.flags & ~RX_CLIENT_INITIATED; - rxi_EncodePacketHeader(ap); - } else { - return ap; - } - rx_packetread(ap, 0, sizeof(struct rx_debugIn), (char *)&tin); /* all done with packet, now set length to the truth, so we can * reuse this packet */ @@ -1395,27 +1384,13 @@ struct rx_packet *rxi_ReceiveVersionPacket(ap, asocket, ahost, aport, istack) register struct rx_packet *ap; int istack; { - afs_int32 tl; - - /* - * Only respond to client-initiated version requests, and - * clear that flag in the response. - */ - if (ap->header.flags & RX_CLIENT_INITIATED) { - char buf[66]; - - ap->header.flags = ap->header.flags & ~RX_CLIENT_INITIATED; - rxi_EncodePacketHeader(ap); - bzero(buf, sizeof(buf)); - strncpy(buf, cml_version_number+4, sizeof(buf)-1); - rx_packetwrite(ap, 0, 65, buf); - tl = ap->length; + afs_int32 tl; + rx_packetwrite(ap, 0, 65, cml_version_number+4); + tl = ap->length; ap->length = 65; rxi_SendDebugPacket(ap, asocket, ahost, aport, istack); - ap->length = tl; - } - - return ap; + ap->length = tl; + return ap; } diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c index 7e96df340..1715f888d 100644 --- a/src/viced/afsfileprocs.c +++ b/src/viced/afsfileprocs.c @@ -28,7 +28,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/viced/afsfileprocs.c,v 1.2 2001/07/20 11:50:35 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/viced/afsfileprocs.c,v 1.3 2001/09/11 14:23:06 hartmans Exp $"); #include #include @@ -6403,16 +6403,16 @@ int CopyOnWrite(targetptr, volptr) rc = IH_DEC(V_linkHandle(volptr), ino, V_parentId(volptr)); if (!rc ) { - ViceLog(0,("CopyOnWrite failed: error %u after i_dec on disk full, volume %u in partition %s needs salvage\n", - rc, V_id(volptr), volptr->partition->name)); + ViceLog(0,("CopyOnWrite failed: volume %u in partition %s needs salvage\n", + V_id(volptr), volptr->partition->name)); VTakeOffline (volptr); } free(buff); return ENOSPC; } else { - ViceLog(0,("CopyOnWrite failed: volume %u in partition %s (tried reading %u, read %u, wrote %u, errno %u) volume needs salvage\n", - V_id(volptr), volptr->partition->name, length, rdlen, wrlen, errno)); + ViceLog(0,("CopyOnWrite failed: volume %u in partition %s needs salvage\n", + V_id(volptr), volptr->partition->name)); /* Decrement this inode so salvager doesn't find it. */ FDH_REALLYCLOSE(newFdP); IH_RELEASE(newH);