rpms/iscsitarget-kmod/devel iscsitarget-0.4.17-2.6.31.patch, NONE, 1.1 iscsitarget-kmod.spec, 1.32, 1.33

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/free/rpms/iscsitarget-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16814

Modified Files:
	iscsitarget-kmod.spec 
Added Files:
	iscsitarget-0.4.17-2.6.31.patch 
Log Message:
* Thu Jul 30 2009 Hans de Goede <hdegoede at redhat.com> - 1:0.4.17-3
- Fix compilation with 2.6.31 kernel


iscsitarget-0.4.17-2.6.31.patch:

--- NEW FILE iscsitarget-0.4.17-2.6.31.patch ---
--- iscsitarget-0.4.15/kernel/config.c~	2008-12-27 22:14:44.000000000 +0100
+++ iscsitarget-0.4.15/kernel/config.c	2009-07-30 10:40:07.000000000 +0200
@@ -5,6 +5,7 @@
  */
 
 #include <linux/proc_fs.h>
+#include <linux/version.h>
 
 #include "iscsi.h"
 #include "iscsi_dbg.h"
@@ -43,7 +44,9 @@ int iet_procfs_init(void)
 	if (!(proc_iet_dir = proc_mkdir("iet", init_net.proc_net)))
 		goto err;
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
 	proc_iet_dir->owner = THIS_MODULE;
+#endif
 
 	for (i = 0; i < ARRAY_SIZE(iet_proc_entries); i++) {
 		ent = create_proc_entry(iet_proc_entries[i].name, 0, proc_iet_dir);


Index: iscsitarget-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/iscsitarget-kmod/devel/iscsitarget-kmod.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- iscsitarget-kmod.spec	5 Jun 2009 13:22:09 -0000	1.32
+++ iscsitarget-kmod.spec	30 Jul 2009 08:58:25 -0000	1.33
@@ -7,7 +7,7 @@
 
 Name:           iscsitarget-kmod
 Version:        0.4.17
-Release:        2%{?dist}.14
+Release:        3%{?dist}
 Epoch:          1
 Summary:        iscsitarget kernel modules
 
@@ -16,6 +16,7 @@
 URL:            http://sourceforge.net/projects/iscsitarget/
 Source0:        http://dl.sf.net/iscsitarget/iscsitarget-%{version}.tar.gz
 Patch0:         iscsitarget-0.4.17-2.6.29.patch
+Patch1:         iscsitarget-0.4.17-2.6.31.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # needed for plague to make sure it builds for i586 and i686
@@ -41,6 +42,7 @@
 %setup -q -c -T -a 0
 pushd iscsitarget-%{version}
 %patch0 -p0 -b .2.6.29
+%patch1 -p1 -b .2.6.31
 popd
 
 for kernel_version in %{?kernel_versions}; do
@@ -71,6 +73,9 @@
 
 
 %changelog
+* Thu Jul 30 2009 Hans de Goede <hdegoede at redhat.com> - 1:0.4.17-3
+- Fix compilation with 2.6.31 kernel
+
 * Fri Jun 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:0.4.17-2.14
 - rebuild for final F11 kernel