Changeset 1555 for trunk/server/fedora

Timestamp:

May 5, 2010, 1:06:27 AM (14 years ago)

Author:

mitchb

Message:

There can be only one!  (so stop hogging the GLOCK)

OpenAFS 1.4.12 had bogus "lost connection" messages, which went
away when we rolled back to 1.4.11.  However, we're now occasionally
having hard lockups because readdir deadlocks waiting for the GLOCK
when filldir is holding it and pagefaults.  Apply
829838e45f94921d22335154587216f7842e3955 from upstream as a
compromise until we can move into the future with OpenAFS 1.5

File:

• trunk/server/fedora/specs/openafs.spec.patch (modified) (11 diffs)

trunk/server/fedora/specs/openafs.spec.patch

@@ -10 +10 @@
  %if %{?osvers:0}%{!?osvers:1}
  %define osvers 1
-@@ -261,6 +261,10 @@
+@@ -261,6 +261,11 @@
  %endif
  ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
@@ -17 +17 @@
 +Patch1003: openafs-localcsdb.patch
 +Patch1005: openafs-numsysnames.patch
++Patch1006: openafs-release-glock.patch
 +
  #    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/...
  Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2
  Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2
-@@ -343,6 +347,7 @@
+@@ -343,6 +348,7 @@
  %if %{build_userspace}
  
@@ -29 +30 @@
  
  %if %{fedorakmod}
-@@ -403,6 +408,7 @@
+@@ -403,6 +409,7 @@
  
  %if %{build_authlibs}
@@ -37 +38 @@
  Group: Networking/Filesystems
  
-@@ -419,6 +425,7 @@
+@@ -419,6 +426,7 @@
  %endif
  
@@ -45 +46 @@
  Requires: openafs-authlibs = %{PACKAGE_VERSION}
  %endif
-@@ -437,6 +444,7 @@
+@@ -437,6 +445,7 @@
  libraries.
  
@@ -53 +54 @@
  Group: Development/Filesystems
  
-@@ -465,6 +473,7 @@
+@@ -465,6 +474,7 @@
  administrators.
  
@@ -61 +62 @@
  Group: Networking/Filesystems
  Provides: openafs-kernel = %{PACKAGE_VERSION}
-@@ -514,6 +523,7 @@
+@@ -514,6 +524,7 @@
  
  %if %{krb5support}
@@ -69 +70 @@
  Requires: openafs = %{PACKAGE_VERSION}
  Group: Networking/Filesystems
-@@ -540,7 +550,7 @@
+@@ -540,7 +551,7 @@
  %if %{build_modules}
  
@@ -78 +79 @@
  %else
  
-@@ -699,6 +709,9 @@
+@@ -699,6 +710,10 @@
  
  # Patch openafs to build a kernel module named "openafs" instead of "libafs"
@@ -85 +86 @@
 +%patch1003 -p1 -b .localcsdb
 +%patch1005 -p1 -b .numsysnames
++%patch1006 -p1 -b .release-glock
  
  ##############################################################################
  #
-@@ -1209,7 +1222,7 @@
+@@ -1209,7 +1224,7 @@
  rm -rf $RPM_BUILD_ROOT%{_sbindir}/kdump*
  
@@ -97 +99 @@
  done
  
-@@ -1569,7 +1582,6 @@
+@@ -1569,7 +1584,6 @@
  %{_libdir}/librxstat.a
  %{_libdir}/libubik.a