From 3ef945c63b6b526ebb23eca71f399cf3cb2c57a5 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Thu, 27 Mar 2008 01:14:11 +0000 Subject: [PATCH] Add upstream delta to fix oops on startup with pre-2.6.25 kernels. --- debian/changelog | 3 ++- debian/patches/linux-restore-iget | 17 +++++++++++++++++ debian/patches/series | 1 + 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 debian/patches/linux-restore-iget diff --git a/debian/changelog b/debian/changelog index 7f7c6fb4c..f2519cdb9 100644 --- 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 Mon, 03 Mar 2008 18:49:17 -0800 + -- Russ Allbery 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 index 000000000..0eb0875c8 --- /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 74c1d0969..d81adf2c0 100644 --- 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 -- 2.39.5