[pve-devel] r5711 - pve-kernel-2.6.18/trunk

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-03-17 07:03:57 +0100 (Thu, 17 Mar 2011)
New Revision: 5711

Added:
   pve-kernel-2.6.18/trunk/scst-workqueue-patch.diff
Modified:
   pve-kernel-2.6.18/trunk/Makefile
   pve-kernel-2.6.18/trunk/changelog.Debian
Log:


Modified: pve-kernel-2.6.18/trunk/Makefile
===================================================================
--- pve-kernel-2.6.18/trunk/Makefile	2011-03-16 13:01:38 UTC (rev 5710)
+++ pve-kernel-2.6.18/trunk/Makefile	2011-03-17 06:03:57 UTC (rev 5711)
@@ -36,7 +36,7 @@
 AOESRC=${AOEDIR}.tar.gz
 
 SCSTDIR=scst
-SCSTSRC=scst-snap-21.12.09.tgz
+SCSTSRC=scst-snap-17.03.11.tgz
 ISCSIDIR=iscsi-scst
 
 OCFS2DIR=ocfs2-1.4.4
@@ -195,7 +195,7 @@
 	cp ${DRBDDIR}/drbd/drbd.ko drbd.ko
 
 scst-src/AskingQuestions:
-	#svn co https://scst.svn.sourceforge.net/svnroot/scst/trunk scst-src
+	#svn co https://scst.svn.sourceforge.net/svnroot/scst/branches/2.0.0.x scst-src
 	tar xf ${SCSTSRC}
 
 scst-modules.tar scstmod ${SCSTDIR}/README: scst-src/AskingQuestions
@@ -205,7 +205,8 @@
 	ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
 	mkdir ${SCSTDIR}/modules
 	cd ${SCSTDIR}; patch -p 1 <../scst-disable-debug.diff
-	cd ${SCSTDIR}; make KDIR=/lib/modules/${KVNAME}/build
+	cd ${SCSTDIR}; patch -p 1 <../scst-workqueue-patch.diff
+	cd ${SCSTDIR}; make enable_proc; make KDIR=/lib/modules/${KVNAME}/build
 	cd ${SCSTDIR}; cp src/*.ko src/dev_handlers/*.ko modules
 	tar cf scst-modules.tar -C ${SCSTDIR}/modules .	
 	touch ${SCSTDIR}/README

Modified: pve-kernel-2.6.18/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.18/trunk/changelog.Debian	2011-03-16 13:01:38 UTC (rev 5710)
+++ pve-kernel-2.6.18/trunk/changelog.Debian	2011-03-17 06:03:57 UTC (rev 5711)
@@ -1,6 +1,8 @@
 pve-kernel-2.6.18 (2.6.18-12) unstable; urgency=low
 
-  *  update to ovzkernel-2.6.18-238.5.1.el5.028stab085.2.src.rpm
+  * update to ovzkernel-2.6.18-238.5.1.el5.028stab085.2.src.rpm
+  
+  * update to SCST 2.0.0.1
 
  -- Proxmox Support Team <support at proxmox.com>  Wed, 16 Mar 2011 13:44:35 +0100
 

Added: pve-kernel-2.6.18/trunk/scst-workqueue-patch.diff
===================================================================
--- pve-kernel-2.6.18/trunk/scst-workqueue-patch.diff	                        (rev 0)
+++ pve-kernel-2.6.18/trunk/scst-workqueue-patch.diff	2011-03-17 06:03:57 UTC (rev 5711)
@@ -0,0 +1,24 @@
+--- scst/include/scst.h.org	2011-03-17 07:00:39.000000000 +0100
++++ scst/include/scst.h	2011-03-17 07:01:10.000000000 +0100
+@@ -3446,21 +3446,6 @@
+ 	return (cmd->out_sg_cnt == 0) ? 1 : cmd->out_sg_cnt;
+ }
+ 
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23) && !defined(BACKPORT_LINUX_WORKQUEUE_TO_2_6_19)
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20))
+-static inline int cancel_delayed_work_sync(struct delayed_work *work)
+-#else
+-static inline int cancel_delayed_work_sync(struct work_struct *work)
+-#endif
+-{
+-	int res;
+-
+-	res = cancel_delayed_work(work);
+-	flush_scheduled_work();
+-	return res;
+-}
+-#endif
+-
+ int scst_suspend_activity(bool interruptible);
+ void scst_resume_activity(void);
+