Add upstream delta to fix oops on startup with pre-2.6.25 kernels.

diff --git a/debian/changelog b/debian/changelog
index 7f7c6fb4c15d8da2133b23a922491a13ec9787a1..f2519cdb9060f9fe648da7b3aa454c429ccc81b7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ openafs (1.4.7~pre1.dfsg1-1) UNRELEASED; urgency=low
     - Potential deadlock fixed in the fileserver.
     - Better fileserver host tracking.
     - Ubik fixes preventing database truncation on unreliable links.
+  * Add upstream delta to fix oops on startup with pre-2.6.25 kernels.
   * Install the up man page as afs-up, matching our renaming, and update
     its text accordingly.  (Closes: #459635)
   * Move openafs-client later in the shutdown sequence on new
@@ -22,7 +23,7 @@ openafs (1.4.7~pre1.dfsg1-1) UNRELEASED; urgency=low
   * Uncomment and fix the watch rules for pre-releases and always scan for
     both regular releases and prereleases.
 
- -- Russ Allbery <rra@debian.org>  Mon, 03 Mar 2008 18:49:17 -0800
+ -- Russ Allbery <rra@debian.org>  Wed, 26 Mar 2008 17:36:17 -0700
 
 openafs (1.4.6.dfsg1-3) unstable; urgency=low
 

diff --git a/debian/patches/linux-restore-iget b/debian/patches/linux-restore-iget
new file mode 100644 (file)
index 0000000..0eb0875
--- /dev/null
+++ b/debian/patches/linux-restore-iget
@@ -0,0 +1,17 @@
+Fixes an oops on startup for Linux 2.4.24 kernels.
+
+STABLE14-linux-restore-iget-cachemgr-20080326
+
+--- openafs.orig/src/afs/LINUX/osi_file.c
++++ openafs/src/afs/LINUX/osi_file.c
+@@ -64,6 +64,10 @@
+     memset(afile, 0, sizeof(struct osi_file));
+ #if defined(HAVE_IGET)
+     tip = iget(afs_cacheSBp, (u_long) ainode);
++    if (!tip)
++      osi_Panic("Can't get inode %d\n", ainode);
++
++    dp = d_alloc_anon(tip);
+ #else
+     fid.i32.ino = ainode;
+     fid.i32.gen = 0;

diff --git a/debian/patches/series b/debian/patches/series
index 74c1d0969ac395cdb68e849a861dd8a235dfc0f3..d81adf2c0899a59f7393aff0178452568d7ccc31 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ ucontext-everywhere
 find-core-files
 ktc-prototypes
 multiple-local-realms
+linux-restore-iget