2:29 a.m.
Author: ktdreyer
Update of /cvs/free/rpms/openafs-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32515
Modified Files:
.cvsignore openafs-kmod.spec sources
Added Files:
openafs-1.6.2.1-hlist-iterator-change.patch
Removed Files:
openafs-1.6.2-Linux-3.8-session_keyring-changes.patch
openafs-1.6.2-Linux-3.8-vmtruncate-removal.patch
openafs-1.6.2-Linux-Detect-undefined-symbols-in-kernel-modules.patch
openafs-1.6.2-Linux-setpag-may-replace-credentials.patch
Log Message:
* Tue Apr 30 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.2.1-1
- Update to OpenAFS 1.6.2.1
- Add patches to support kernel 3.9
openafs-1.6.2.1-hlist-iterator-change.patch:
acinclude.m4 | 1 +
src/afs/LINUX/osi_vnodeops.c | 6 +++++-
src/cf/linux-test4.m4 | 15 +++++++++++++++
3 files changed, 21 insertions(+), 1 deletion(-)
--- NEW FILE openafs-1.6.2.1-hlist-iterator-change.patch ---
commit 0671e93abcf927d48f935283682e6761a933d558
Author: Marc Dionne <marc.c.dionne(a)gmail.com>
Date: Tue Mar 5 20:54:50 2013 -0500
Linux 3.9: hlist iterator change
hlist iterators have been reworked to not require a temporary
node parameter.
Reviewed-on: http://gerrit.openafs.org/9403
Tested-by: BuildBot <buildbot(a)rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman(a)your-file-system.com>
Reviewed-by: Derrick Brashear <shadow(a)your-file-system.com>
(cherry picked from commit 9cfd7f768ca350d3b750e89e7ddb186bdad6f726)
Change-Id: I47df8894467f4bb1c60cf239ec0ce0a4d6ca29aa
Reviewed-on: http://gerrit.openafs.org/9639
Tested-by: BuildBot <buildbot(a)rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow(a)your-file-system.com>
Reviewed-by: Benjamin Kaduk <kaduk(a)mit.edu>
Reviewed-by: Michael Meffie <mmeffie(a)sinenomine.net>
Reviewed-by: Stephan Wiesand <stephan.wiesand(a)desy.de>
diff --git a/acinclude.m4 b/acinclude.m4
index 4223bb1..6f5bc8d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -991,6 +991,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
LINUX_KMAP_ATOMIC_TAKES_NO_KM_TYPE
LINUX_DENTRY_OPEN_TAKES_PATH
LINUX_D_ALIAS_IS_HLIST
+ LINUX_HLIST_ITERATOR_NO_NODE
LINUX_IOP_I_CREATE_TAKES_BOOL
LINUX_DOP_D_REVALIDATE_TAKES_UNSIGNED
LINUX_IOP_LOOKUP_TAKES_UNSIGNED
diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
index 1366b96..8e7dfe2 100644
--- a/src/afs/LINUX/osi_vnodeops.c
+++ b/src/afs/LINUX/osi_vnodeops.c
@@ -701,7 +701,7 @@ canonical_dentry(struct inode *ip)
{
struct vcache *vcp = VTOAFS(ip);
struct dentry *first = NULL, *ret = NULL, *cur;
-#if defined(D_ALIAS_IS_HLIST)
+#if defined(D_ALIAS_IS_HLIST) && !defined(HLIST_ITERATOR_NO_NODE)
struct hlist_node *p;
#endif
@@ -724,7 +724,11 @@ canonical_dentry(struct inode *ip)
# endif
#if defined(D_ALIAS_IS_HLIST)
+# if defined(HLIST_ITERATOR_NO_NODE)
+ hlist_for_each_entry(cur, &ip->i_dentry, d_alias) {
+# else
hlist_for_each_entry(cur, p, &ip->i_dentry, d_alias) {
+# endif
#else
list_for_each_entry_reverse(cur, &ip->i_dentry, d_alias) {
#endif
diff --git a/src/cf/linux-test4.m4 b/src/cf/linux-test4.m4
index fc0149f..7c0a181 100644
--- a/src/cf/linux-test4.m4
+++ b/src/cf/linux-test4.m4
@@ -714,6 +714,21 @@ AC_DEFUN([LINUX_D_ALIAS_IS_HLIST], [
])
+AC_DEFUN([LINUX_HLIST_ITERATOR_NO_NODE], [
+ AC_CHECK_LINUX_BUILD([whether hlist iterators don't need a node parameter],
+ [ac_cv_linux_hlist_takes_no_node],
+ [#include <linux/list.h>
+ #include <linux/fs.h>],
+ [struct dentry *d = NULL, *cur;
+ struct inode *ip;
+ hlist_for_each_entry(cur, &ip->i_dentry, d_alias) { }
+ ],
+ [HLIST_ITERATOR_NO_NODE],
+ [define if hlist iterators don't need a node parameter],
+ [])
+])
+
+
AC_DEFUN([LINUX_IOP_I_CREATE_TAKES_BOOL], [
AC_CHECK_LINUX_BUILD([whether inode_operations.create takes a bool],
[ac_cv_linux_func_i_create_takes_bool],
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 14 Feb 2013 23:10:29 -0000 1.13
+++ .cvsignore 1 May 2013 02:29:30 -0000 1.14
@@ -1 +1 @@
-openafs-1.6.2-src.tar.bz2
+openafs-1.6.2.1-src.tar.bz2
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/devel/openafs-kmod.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- openafs-kmod.spec 4 Mar 2013 01:16:11 -0000 1.29
+++ openafs-kmod.spec 1 May 2013 02:29:33 -0000 1.30
@@ -20,8 +20,8 @@
# name should have a -kmod suffix
Name: %{kmod_name}-kmod
-Version: 1.6.2
-Release: 3%{?dist}
+Version: 1.6.2.1
+Release: 1%{?dist}
Summary: Kernel module(s)
Group: System Environment/Kernel
@@ -32,19 +32,9 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# Upstream patches to support kernel 3.8.
-# http://gerrit.openafs.org/8941
-Patch0: openafs-1.6.2-Linux-3.8-session_keyring-changes.patch
-# http://gerrit.openafs.org/8942
-Patch1: openafs-1.6.2-Linux-3.8-vmtruncate-removal.patch
-
-# Fix "aklog -setpag" on Linux 3.8
-# http://gerrit.openafs.org/8948
-Patch2: openafs-1.6.2-Linux-setpag-may-replace-credentials.patch
-
-# Make broken builds a little easier to debug
-# http://gerrit.openafs.org/9334
-Patch3: openafs-1.6.2-Linux-Detect-undefined-symbols-in-kernel-modules.patch
+# Upstream patch to support kernel 3.9.
+# http://gerrit.openafs.org/9639
+Patch0: openafs-1.6.2.1-hlist-iterator-change.patch
%global AkmodsBuildRequires %{_bindir}/kmodtool, pam-devel, ncurses-devel, flex, byacc,
bison, automake
@@ -73,13 +63,8 @@
# apply patches and do other stuff here
pushd %{kmod_name}-%{version}
-# Kernel 3.8 patches
+# Kernel 3.9 patch
%patch0 -p1
-%patch1 -p1
-# Fix "aklog -setpag" on Linux 3.8
-%patch2 -p1
-# Detect undefined symbols in kmods
-%patch3 -p1
./regen.sh
popd
@@ -118,6 +103,10 @@
%changelog
+* Tue Apr 30 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.2.1-1
+- Update to OpenAFS 1.6.2.1
+- Add patches to support kernel 3.9
+
* Sat Mar 02 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.2-3
- Add patches to support kernel 3.8
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 21 Feb 2013 19:48:47 -0000 1.16
+++ sources 1 May 2013 02:29:33 -0000 1.17
@@ -1 +1 @@
-ab1335f74214487aa363b614fbfa3a00 openafs-1.6.2-src.tar.bz2
+465092bf21ca7704ed9d175506ba6cef openafs-1.6.2.1-src.tar.bz2
--- openafs-1.6.2-Linux-3.8-session_keyring-changes.patch DELETED ---
--- openafs-1.6.2-Linux-3.8-vmtruncate-removal.patch DELETED ---
--- openafs-1.6.2-Linux-Detect-undefined-symbols-in-kernel-modules.patch DELETED ---
--- openafs-1.6.2-Linux-setpag-may-replace-credentials.patch DELETED ---