[vdsm/f19] Reverting iscsi changes

[Yaniv Bronhaim]

commit 283e0698c2ae05ca1804d026932770943646dfa7
Author: Yaniv Bronhaim <ybronhei at redhat.com>
Date:   Mon Jan 13 20:06:53 2014 +0200

    Reverting iscsi changes
    
    The patch introduced a regression by import zombieReaper package

 0001-Using-old-form-of-zombiereaper.patch |    2 +-
 vdsm.spec                                 |    8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/0001-Using-old-form-of-zombiereaper.patch b/0001-Using-old-form-of-zombiereaper.patch
index cbe38ed..1615ae5 100644
--- a/0001-Using-old-form-of-zombiereaper.patch
+++ b/0001-Using-old-form-of-zombiereaper.patch
@@ -1,7 +1,7 @@
 From d1bb20a892d32822e8f04488fb12df0ffea76a04 Mon Sep 17 00:00:00 2001
 From: Yaniv Bronhaim <ybronhei at redhat.com>
 Date: Mon, 13 Jan 2014 14:55:35 +0200
-Subject: [PATCH] Using old form of zombiereaper
+Subject: [PATCH 1/4] Using old form of zombiereaper
 
 In ovirt-3.3 we don't include the change [1] that modifies zombieReaper
 to zombiereaper.
diff --git a/vdsm.spec b/vdsm.spec
index 39ccc08..448b2b0 100644
--- a/vdsm.spec
+++ b/vdsm.spec
@@ -62,6 +62,9 @@ Url:            http://www.ovirt.org/wiki/Vdsm
 Source0:        %{vdsm_name}-%{version}%{?vdsm_relttag}.tar.gz
 # ovirt-3.3.3 patches
 Patch0:         0001-Using-old-form-of-zombiereaper.patch
+Patch1:         0002-Revert-Using-old-form-of-zombiereaper.patch
+Patch2:         0003-Revert-utils-Create-AsyncProcessOperation.patch
+Patch3:         0004-Revert-iscsi-Iscsi-rescan-cleanup.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -563,6 +566,10 @@ Gluster plugin enables VDSM to serve Gluster functionalities.
 %setup -q
 # ovirt-3.3.3 patches
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
 
 %if 0%{?rhel} == 6
 sed -i '/ su /d' vdsm/vdsm-logrotate.conf.in
@@ -1332,7 +1339,6 @@ exit 0
 - spec: bumping iscsi-initiator-utils requirement
 - removing redundant check-local from storage makefile
 - Adding exception handling in external threads
-- cleanup of iscsi operations - adding (AsyncProcessOperation)
 - fix bridgeless broken network deletion
 - gluster api fix
 - fix log issues - Changed BrokerLink log level to prevent log flooding