From 5c53cf85f2885604ba87cb4eded37c0162456264 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Thu, 11 Aug 2005 03:36:40 +0000 Subject: [PATCH] Drop obsolete patches that are no longer used or that have been incorporated upstream. --- debian/patch.07_kernel_source_2.4.21 | 44 ----------------- debian/patch.stale-cache | 74 ---------------------------- 2 files changed, 118 deletions(-) delete mode 100644 debian/patch.07_kernel_source_2.4.21 delete mode 100644 debian/patch.stale-cache diff --git a/debian/patch.07_kernel_source_2.4.21 b/debian/patch.07_kernel_source_2.4.21 deleted file mode 100644 index 24a17741c..000000000 --- a/debian/patch.07_kernel_source_2.4.21 +++ /dev/null @@ -1,44 +0,0 @@ -Index: src/libafs/MakefileProto.LINUX.in -=================================================================== -RCS file: /afs/sipb.mit.edu/project/openafs/debian/cvs/openafs/src/libafs/MakefileProto.LINUX.in,v -retrieving revision 1.9 -diff -u -r1.9 MakefileProto.LINUX.in ---- src/libafs/MakefileProto.LINUX.in 11 Dec 2002 03:00:40 -0000 1.9 -+++ src/libafs/MakefileProto.LINUX.in 26 Jul 2003 20:46:52 -0000 -@@ -89,7 +89,7 @@ - -mfixed-range=f10-f15,f32-f127 -falign-functions=32 -mb-step - DEFINES = -D__KERNEL__ -DKERNEL -D_KERNEL ${SMP_DEF} -DMODULE - --INCLUDES = -I. -I../ -I${TOP_SRCDIR}/config -+INCLUDES = -I. -I../ -I${LINUX_KERNEL_PATH}/include -I${TOP_SRCDIR}/config - - CFLAGS = $(CCFLAGS) $(DEFINES) $(INCLUDES) - -Index: src/rx/rx_kcommon.h -=================================================================== -RCS file: /afs/sipb.mit.edu/project/openafs/debian/cvs/openafs/src/rx/rx_kcommon.h,v -retrieving revision 1.1.1.9 -diff -u -r1.1.1.9 rx_kcommon.h ---- src/rx/rx_kcommon.h 13 Apr 2003 19:07:24 -0000 1.1.1.9 -+++ src/rx/rx_kcommon.h 26 Jul 2003 20:46:53 -0000 -@@ -33,7 +33,10 @@ - #include "../h/disp.h" - #endif - #include "../h/socket.h" --#ifndef AFS_LINUX22_ENV -+#ifdef AFS_LINUX22_ENV -+#define _LINUX_CODA_FS_I -+struct coda_inode_info {}; -+#else - #include "../h/socketvar.h" - #include "../h/protosw.h" - #if !defined(AFS_SUN5_ENV) && !defined(AFS_XBSD_ENV) -@@ -80,8 +83,6 @@ - #include "../h/user.h" - #endif - #ifdef AFS_LINUX22_ENV --#define _LINUX_CODA_FS_I --struct coda_inode_info {}; - #include "../h/sched.h" - #include "../h/netdevice.h" - #else diff --git a/debian/patch.stale-cache b/debian/patch.stale-cache deleted file mode 100644 index 3158d7e06..000000000 --- a/debian/patch.stale-cache +++ /dev/null @@ -1,74 +0,0 @@ -Patch from Chas Williams posted to -openafs-devel@openafs.org on 2005-05-05. Chances are very high that -this will be in 1.3.83, so check again then. Fixes a bug introduced -in 1.3.82. - ---- src/afs/LINUX/osi_vnodeops.c.orig 2005-04-25 10:55:47.000000000 -0400 -+++ src/afs/LINUX/osi_vnodeops.c 2005-05-05 09:28:26.000000000 -0400 -@@ -867,7 +867,7 @@ - cred_t *credp = NULL; - struct vrequest treq; - int code, bad_dentry; -- struct vcache *vcp, *parentvcp; -+ struct vcache *vcp, *pvcp; - - #ifdef AFS_LINUX24_ENV - lock_kernel(); -@@ -875,14 +875,20 @@ - AFS_GLOCK(); - - vcp = ITOAFS(dp->d_inode); -- parentvcp = ITOAFS(dp->d_parent->d_inode); /* dget_parent()? */ -+ pvcp = ITOAFS(dp->d_parent->d_inode); /* dget_parent()? */ - - /* If it's a negative dentry, it's never valid */ -- if (!vcp || !parentvcp) { -+ if (!vcp || !pvcp) { - bad_dentry = 1; - goto done; - } - -+ /* parent's DataVersion changed? */ -+ if (hgetlo(pvcp->m.DataVersion) > dp->d_time) { -+ bad_dentry = 11; -+ goto done; -+ } -+ - /* If it's @sys, perhaps it has been changed */ - if (!afs_ENameOK(dp->d_name.name)) { - bad_dentry = 10; -@@ -1024,6 +1030,7 @@ - #endif - - dp->d_op = &afs_dentry_operations; -+ dp->d_time = hgetlo(ITOAFS(dip)->m.DataVersion); - d_instantiate(dp, ip); - } - -@@ -1095,6 +1102,7 @@ - #endif - } - dp->d_op = &afs_dentry_operations; -+ dp->d_time = hgetlo(ITOAFS(dip)->m.DataVersion); - d_add(dp, AFSTOI(vcp)); - - #if defined(AFS_LINUX26_ENV) -@@ -1185,8 +1193,10 @@ - } - AFS_GUNLOCK(); - -- if (!code) -+ if (!code) { -+ __dp->d_time = hgetlo(ITOAFS(dip)->m.DataVersion); - d_move(dp, __dp); -+ } - dput(__dp); - - goto out; -@@ -1252,6 +1262,7 @@ - tvcp->v.v_fop = &afs_dir_fops; - #endif - dp->d_op = &afs_dentry_operations; -+ dp->d_time = hgetlo(ITOAFS(dip)->m.DataVersion); - d_instantiate(dp, AFSTOI(tvcp)); - } -- 2.39.5