diff --git a/heartbeat/iSCSILogicalUnit b/heartbeat/iSCSILogicalUnit
index 0a07c5faa..5c5dcc2c3 100755
--- a/heartbeat/iSCSILogicalUnit
+++ b/heartbeat/iSCSILogicalUnit
@@ -1,690 +1,696 @@
 #!/bin/bash
 #
 #
 #   iSCSILogicalUnit OCF RA. Exports and manages iSCSI Logical Units.
 #
 #   (c) 2013 LINBIT, Lars Ellenberg
 #   (c) 2009-2010 Florian Haas, Dejan Muhamedagic,
 #       and Linux-HA contributors
 #
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
 # published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it would be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
 # Further, this software is distributed without any warranty that it is
 # free of the rightful claim of any third person regarding infringement
 # or the like.  Any license provided herein, whether implied or
 # otherwise, applies only to this software file.  Patent licenses, if
 # any, provided herein do not apply to combinations of this program with
 # other software, or any other product whatsoever.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write the Free Software Foundation,
 # Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
 #
 
 #######################################################################
 # Initialization:
 : ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
 . ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
 
 # Defaults
 # Set a default implementation based on software installed
 if have_binary ietadm; then
 	OCF_RESKEY_implementation_default="iet"
 elif have_binary tgtadm; then
 	OCF_RESKEY_implementation_default="tgt"
 elif have_binary lio_node; then
 	OCF_RESKEY_implementation_default="lio"
 elif have_binary targetcli; then
 	OCF_RESKEY_implementation_default="lio-t"
 fi
 : ${OCF_RESKEY_implementation=${OCF_RESKEY_implementation_default}}
 
 # Use a default SCSI ID and SCSI SN that is unique across the cluster,
 # and persistent in the event of resource migration.
 # SCSI IDs are limited to 24 bytes, but only 16 bytes are known to be
 # supported by all iSCSI implementations this RA cares about. Thus,
 # for a default, use the first 16 characters of
 # $OCF_RESOURCE_INSTANCE.
 OCF_RESKEY_scsi_id_default="${OCF_RESOURCE_INSTANCE:0:16}"
 : ${OCF_RESKEY_scsi_id=${OCF_RESKEY_scsi_id_default}}
 # To have a reasonably unique default SCSI SN, use the first 8 bytes
 # of an MD5 hash of of $OCF_RESOURCE_INSTANCE
 sn=`echo -n "${OCF_RESOURCE_INSTANCE}" | openssl md5 | sed -e 's/(stdin)= //'`
 OCF_RESKEY_scsi_sn_default=${sn:0:8}
 : ${OCF_RESKEY_scsi_sn=${OCF_RESKEY_scsi_sn_default}}
 # set 0 as a default value for lio iblock device number
 OCF_RESKEY_lio_iblock_default=0
 OCF_RESKEY_lio_iblock=${OCF_RESKEY_lio_iblock:-$OCF_RESKEY_lio_iblock_default}
 
 ## tgt specifics
 # tgt has "backing store type" and "backing store open flags",
 # as well as device-type.
 #
 # suggestions how to make this generic accross all supported implementations?
 # how should they be named, how should they be mapped to implementation specifics?
 #
 # OCF_RESKEY_tgt_bstype
 # OCF_RESKEY_tgt_bsoflags
 # OCF_RESKEY_tgt_bsopts
 # OCF_RESKEY_tgt_device_type
 
+# targetcli: iSCSITarget and iSCSILogicalUnit must use the same lockfile
+TARGETLOCKFILE=${HA_RSCTMP}/targetcli.lock
 #######################################################################
 
 meta_data() {
 	cat <<END
 <?xml version="1.0"?>
 <!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
 <resource-agent name="iSCSILogicalUnit">
 <version>0.9</version>
 
 <longdesc lang="en">
 Manages iSCSI Logical Unit. An iSCSI Logical unit is a subdivision of 
 an SCSI Target, exported via a daemon that speaks the iSCSI protocol.
 </longdesc>
 <shortdesc lang="en">Manages iSCSI Logical Units (LUs)</shortdesc>
 
 <parameters>
 <parameter name="implementation" required="0" unique="0">
 <longdesc lang="en">
 The iSCSI target daemon implementation. Must be one of "iet", "tgt",
 "lio", or "lio-t".  If unspecified, an implementation is selected based on the
 availability of management utilities, with "iet" being tried first,
 then "tgt", then "lio", then "lio-t".
 </longdesc>
 <shortdesc lang="en">iSCSI target daemon implementation</shortdesc>
 <content type="string" default="${OCF_RESKEY_implementation_default}"/>
 </parameter>
 
 <parameter name="target_iqn" required="1" unique="0">
 <longdesc lang="en">
 The iSCSI Qualified Name (IQN) that this Logical Unit belongs to.
 </longdesc>
 <shortdesc lang="en">iSCSI target IQN</shortdesc>
 <content type="string" />
 </parameter>
 
 <parameter name="lun" required="1" unique="0">
 <longdesc lang="en">
 The Logical Unit number (LUN) exposed to initiators.
 </longdesc>
 <shortdesc lang="en">Logical Unit number (LUN)</shortdesc>
 <content type="integer" />
 </parameter>
 
 <parameter name="path" required="1" unique="0">
 <longdesc lang="en">
 The path to the block device exposed. Some implementations allow this
 to be a regular file, too.
 </longdesc>
 <shortdesc lang="en">Block device (or file) path</shortdesc>
 <content type="string" />
 </parameter>
 
 <parameter name="scsi_id" required="0" unique="1">
 <longdesc lang="en">
 The SCSI ID to be configured for this Logical Unit. The default
 is the resource name, truncated to 24 bytes.
 </longdesc>
 <shortdesc lang="en">SCSI ID</shortdesc>
 <content type="string" default="${OCF_RESKEY_scsi_id_default}"/>
 </parameter>
 
 <parameter name="scsi_sn" required="0" unique="1">
 <longdesc lang="en">
 The SCSI serial number to be configured for this Logical Unit.
 The default is a hash of the resource name, truncated to 8 bytes.
 </longdesc>
 <shortdesc lang="en">SCSI serial number</shortdesc>
 <content type="string" default="${OCF_RESKEY_scsi_sn_default}"/>
 </parameter>
 
 <parameter name="vendor_id" required="0" unique="0">
 <longdesc lang="en">
 The SCSI vendor ID to be configured for this Logical Unit.
 </longdesc>
 <shortdesc lang="en">SCSI vendor ID</shortdesc>
 <content type="string" />
 </parameter>
 
 <parameter name="product_id" required="0" unique="0">
 <longdesc lang="en">
 The SCSI product ID to be configured for this Logical Unit.
 </longdesc>
 <shortdesc lang="en">SCSI product ID</shortdesc>
 <content type="string" />
 </parameter>
 
 <parameter name="tgt_bstype" required="0" unique="0">
 <longdesc lang="en">
 TGT specific backing store type. If you want to use aio,
 make sure your tgtadm is built against libaio.
 See tgtadm(8).
 </longdesc>
 <shortdesc lang="en">TGT backing store type</shortdesc>
 <content type="string" />
 </parameter>
 
 <parameter name="tgt_bsoflags" required="0" unique="0">
 <longdesc lang="en">
 TGT specific backing store open flags (direct|sync).
 See tgtadm(8).
 </longdesc>
 <shortdesc lang="en">TGT backing store open flags</shortdesc>
 <content type="string" />
 </parameter>
 
 <parameter name="tgt_bsopts" required="0" unique="0">
 <longdesc lang="en">
 TGT specific backing store options.
 See tgtadm(8).
 </longdesc>
 <shortdesc lang="en">TGT backing store options</shortdesc>
 <content type="string" />
 </parameter>
 
 <parameter name="tgt_device_type" required="0" unique="0">
 <longdesc lang="en">
 TGT specific device type.
 See tgtadm(8).
 </longdesc>
 <shortdesc lang="en">TGT device type</shortdesc>
 <content type="string" />
 </parameter>
 
 <parameter name="additional_parameters" required="0" unique="0">
 <longdesc lang="en">
 Additional LU parameters. A space-separated list of "name=value" pairs
 which will be passed through to the iSCSI daemon's management
 interface. The supported parameters are implementation
 dependent. Neither the name nor the value may contain whitespace.
 </longdesc>
 <shortdesc lang="en">List of iSCSI LU parameters</shortdesc>
 <content type="string" />
 </parameter>
 
 <parameter name="allowed_initiators" required="0" unique="0">
 <longdesc lang="en">
 Allowed initiators. A space-separated list of initiators allowed to
 connect to this lun. Initiators may be listed in any syntax
 the target implementation allows. If this parameter is empty or
 not set, access to this lun will not be allowed from any initiator,
 if target is not in demo mode.
 
 This parameter is only necessary when using LIO.
 </longdesc>
 <shortdesc lang="en">List of iSCSI initiators allowed to connect
 to this lun.</shortdesc>
 <content type="string" default=""/>
 </parameter>
 
 <parameter name="lio_iblock" required="0" unique="0">
 <longdesc lang="en">
 LIO iblock device name, a number starting from 0.
 
 Using distinct values here avoids a warning in LIO "LEGACY: SHARED HBA";
 and it is necessary when using multiple LUNs started at the same time
 (eg. on node failover) to prevent a race condition in tcm_core on mkdir()
 in /sys/kernel/config/target/core/.
 </longdesc>
 <shortdesc lang="en">LIO iblock device number</shortdesc>
 <content type="integer" default="0"/>
 </parameter>
 
 </parameters>
 
 <actions>
 <action name="start"         timeout="10" />
 <action name="stop"          timeout="10" />
 <action name="status"        timeout="10" interval="10" depth="0" />
 <action name="monitor"       timeout="10" interval="10" depth="0" />
 <action name="meta-data"     timeout="5" />
 <action name="validate-all"  timeout="10" />
 </actions>
 </resource-agent>
 END
 }
 
 #######################################################################
 
 iSCSILogicalUnit_usage() {
 	cat <<END
 usage: $0 {start|stop|status|monitor|validate-all|meta-data}
 
 Expects to have a fully populated OCF RA-compliant environment set.
 END
 }
 
 iSCSILogicalUnit_start() {
 	iSCSILogicalUnit_monitor
 	if [ $? =  $OCF_SUCCESS ]; then
 		return $OCF_SUCCESS
 	fi
 
 	local params
 
 	case $OCF_RESKEY_implementation in
 	iet)
 		params="Path=${OCF_RESKEY_path}"
 		# use blockio if path points to a block device, fileio
 		# otherwise.
 		if [ -b "${OCF_RESKEY_path}" ]; then
 			params="${params} Type=blockio"
 		else
 			params="${params} Type=fileio"
 		fi
 		# in IET, we have to set LU parameters on creation
 		if [ -n "${OCF_RESKEY_scsi_id}" ]; then
 			params="${params} ScsiId=${OCF_RESKEY_scsi_id}"
 		fi
 		if [ -n "${OCF_RESKEY_scsi_sn}" ]; then
 			params="${params} ScsiSN=${OCF_RESKEY_scsi_sn}"
 		fi
 		params="${params} ${OCF_RESKEY_additional_parameters}"
 		ocf_run ietadm --op new \
 			--tid=${TID} \
 			--lun=${OCF_RESKEY_lun} \
 			--params ${params// /,} || exit $OCF_ERR_GENERIC
 		;;
 	tgt)
 		# tgt requires that we create the LU first, then set LU
 		# parameters
 		params=""
 		local var
 		local envar
 		for var in scsi_id scsi_sn vendor_id product_id; do
 			envar="OCF_RESKEY_${var}"
 			if [ -n "${!envar}" ]; then
 				params="${params} ${var}=${!envar}"
 			fi
 		done
 		params="${params} ${OCF_RESKEY_additional_parameters}"
 
 		# cleanup: tgt (as of tgtadm version 1.0.24) does not like an explicit "bsoflags=direct"
 		# when used with "bstype=aio" (which always uses O_DIRECT)
 		[[ $OCF_RESKEY_tgt_bstype/$OCF_RESKEY_tgt_bsoflags = "aio/direct" ]] && OCF_RESKEY_tgt_bsoflags=""
 
 		tgt_args=""
 		[[ $OCF_RESKEY_tgt_bstype ]]	&& tgt_args="$tgt_args --bstype=$OCF_RESKEY_tgt_bstype"
 		[[ $OCF_RESKEY_tgt_bsoflags ]]	&& tgt_args="$tgt_args --bsoflags=$OCF_RESKEY_tgt_bsoflags"
 		[[ $OCF_RESKEY_tgt_bsopts ]]	&& tgt_args="$tgt_args --bsopts=$OCF_RESKEY_tgt_bsopts"
 		[[ $OCF_RESKEY_tgt_device_type ]]	&& tgt_args="$tgt_args --device-type=$OCF_RESKEY_tgt_device_type"
 
 		ocf_run tgtadm --lld iscsi --op new --mode logicalunit \
 			--tid=${TID} \
 			--lun=${OCF_RESKEY_lun} \
 			$tgt_args \
 			--backing-store ${OCF_RESKEY_path} || exit $OCF_ERR_GENERIC
 		if [ -z "$params" ]; then
 			return $OCF_SUCCESS
 		else
 			ocf_run tgtadm --lld iscsi --op update --mode logicalunit \
 				--tid=${TID} \
 				--lun=${OCF_RESKEY_lun} \
 				--params ${params// /,} || exit $OCF_ERR_GENERIC
 		fi
 		;;
 	lio)
 		# For lio, we first have to create a target device, then
 		# add it to the Target Portal Group as an LU.
 
 		block_configfs_path="/sys/kernel/config/target/core/iblock_${OCF_RESKEY_lio_iblock}/${OCF_RESOURCE_INSTANCE}/udev_path"
 		if [ ! -e "${block_configfs_path}" ]; then
 			ocf_run tcm_node --createdev=iblock_${OCF_RESKEY_lio_iblock}/${OCF_RESOURCE_INSTANCE} \
 				${OCF_RESKEY_path} || exit $OCF_ERR_GENERIC
 		elif [ -e "$block_configfs_path" ] && [ $(cat "$block_configfs_path") != "${OCF_RESKEY_path}" ]; then
 			ocf_exit_reason "Existing iblock_${OCF_RESKEY_lio_iblock}/${OCF_RESOURCE_INSTANCE} has incorrect path: $(cat "$block_configfs_path") != ${OCF_RESKEY_path}"
 			exit $OCF_ERR_GENERIC
 		else
 			ocf_log info "iscsi iblock already exists: ${block_configfs_path}"
 		fi
 
 		if [ -n "${OCF_RESKEY_scsi_sn}" ]; then
 			ocf_run tcm_node --setunitserial=iblock_${OCF_RESKEY_lio_iblock}/${OCF_RESOURCE_INSTANCE} \
 				${OCF_RESKEY_scsi_sn} || exit $OCF_ERR_GENERIC
 		fi
 
 		lun_configfs_path="/sys/kernel/config/target/iscsi/${OCF_RESKEY_target_iqn}/tpgt_1/lun/lun_${OCF_RESKEY_lun}/${OCF_RESOURCE_INSTANCE}/udev_path"
 		if [ ! -e "${lun_configfs_path}" ]; then
 			ocf_run lio_node --addlun=${OCF_RESKEY_target_iqn} 1 ${OCF_RESKEY_lun} \
 				${OCF_RESOURCE_INSTANCE} iblock_${OCF_RESKEY_lio_iblock}/${OCF_RESOURCE_INSTANCE} || exit $OCF_ERR_GENERIC
 		else
 			ocf_log info "iscsi lun already exists: ${lun_configfs_path}"
 		fi
 
 		if [ -n "${OCF_RESKEY_allowed_initiators}" ]; then
 			for initiator in ${OCF_RESKEY_allowed_initiators}; do
 				acl_configfs_path="/sys/kernel/config/target/iscsi/${OCF_RESKEY_target_iqn}/tpgt_1/acls/${initiator}/lun_${OCF_RESKEY_lun}"
 				if [ ! -e "${acl_configfs_path}" ]; then
 					ocf_run lio_node --addlunacl=${OCF_RESKEY_target_iqn} 1 \
 					${initiator} ${OCF_RESKEY_lun} ${OCF_RESKEY_lun} || exit $OCF_ERR_GENERIC
 				else
 					ocf_log info "iscsi acl already exists: ${acl_configfs_path}"
 				fi
 			done
 		fi
 		;;
 	lio-t)
+		ocf_take_lock $TARGETLOCKFILE
+		ocf_release_lock_on_exit $TARGETLOCKFILE
 		# For lio, we first have to create a target device, then
 		# add it to the Target Portal Group as an LU.
 		ocf_run targetcli /backstores/block create name=${OCF_RESOURCE_INSTANCE} dev=${OCF_RESKEY_path} || exit $OCF_ERR_GENERIC
 		if [ -n "${OCF_RESKEY_scsi_sn}" ]; then
 			echo ${OCF_RESKEY_scsi_sn} > /sys/kernel/config/target/core/iblock_${OCF_RESKEY_lio_iblock}/${OCF_RESOURCE_INSTANCE}/wwn/vpd_unit_serial
 		fi
 		ocf_run targetcli /iscsi/${OCF_RESKEY_target_iqn}/tpg1/luns create /backstores/block/${OCF_RESOURCE_INSTANCE} ${OCF_RESKEY_lun} || exit $OCF_ERR_GENERIC
 
 		if [ -n "${OCF_RESKEY_allowed_initiators}" ]; then
 			for initiator in ${OCF_RESKEY_allowed_initiators}; do
 				ocf_run targetcli /iscsi/${OCF_RESKEY_target_iqn}/tpg1/acls create ${initiator} add_mapped_luns=False || exit $OCF_ERR_GENERIC
 				ocf_run targetcli /iscsi/${OCF_RESKEY_target_iqn}/tpg1/acls/${initiator} create ${OCF_RESKEY_lun} ${OCF_RESKEY_lun} || exit $OCF_ERR_GENERIC
 			done
 		fi
 		;;
 	esac
 
 	# Force the monitor operation to pass before start is considered a success.
 	iSCSILogicalUnit_monitor
 }
 
 iSCSILogicalUnit_stop() {
 	iSCSILogicalUnit_monitor
 	if [ $? -eq $OCF_NOT_RUNNING ]; then
 		return $OCF_SUCCESS
 	fi
 
 	case $OCF_RESKEY_implementation in
 
 	iet)
 	# IET allows us to remove LUs while they are in use
 	ocf_run ietadm --op delete \
 		--tid=${TID} \
 		--lun=${OCF_RESKEY_lun} || exit $OCF_ERR_GENERIC
 		;;
 	tgt)
 		# tgt will fail to remove an LU while it is in use,
 		# but at the same time does not allow us to
 		# selectively shut down a connection that is using a
 		# specific LU. Thus, we need to loop here until tgtd
 		# decides that the LU is no longer in use, or we get
 		# timed out by the LRM.
 		while ! ocf_run -warn tgtadm --lld iscsi --op delete --mode logicalunit \
 			--tid ${TID} \
 			--lun=${OCF_RESKEY_lun}; do
 			sleep 1
 		done
 		;;
 	lio)
 
 		acls_configfs_path="/sys/kernel/config/target/iscsi/${OCF_RESKEY_target_iqn}/tpgt_1/acls"
 		for initiatorpath in ${acls_configfs_path}/*; do
 			initiator=$(basename "${initiatorpath}")
 			if [ -e "${initiatorpath}/lun_${OCF_RESKEY_lun}" ]; then
 				ocf_log info "deleting acl at ${initiatorpath}/lun_${OCF_RESKEY_lun}"
 				ocf_run lio_node --dellunacl=${OCF_RESKEY_target_iqn} 1 \
 					${initiator} ${OCF_RESKEY_lun} || exit $OCF_ERR_GENERIC
 			fi
 		done
 		lun_configfs_path="/sys/kernel/config/target/iscsi/${OCF_RESKEY_target_iqn}/tpgt_1/lun/lun_${OCF_RESKEY_lun}/"
 		if [ -e "${lun_configfs_path}" ]; then
 			ocf_run lio_node --dellun=${OCF_RESKEY_target_iqn} 1 ${OCF_RESKEY_lun} || exit $OCF_ERR_GENERIC
 		fi
 		block_configfs_path="/sys/kernel/config/target/core/iblock_${OCF_RESKEY_lio_iblock}/${OCF_RESOURCE_INSTANCE}/udev_path"
 		if [ -e "${block_configfs_path}" ]; then
 			ocf_run tcm_node --freedev=iblock_${OCF_RESKEY_lio_iblock}/${OCF_RESOURCE_INSTANCE} || exit $OCF_ERR_GENERIC
 		fi
 		;;
 	lio-t)
+		ocf_take_lock $TARGETLOCKFILE
+		ocf_release_lock_on_exit $TARGETLOCKFILE
 		# "targetcli delete" will fail if the LUN is already
 		# gone. Log a warning and still push ahead.
 		ocf_run -warn targetcli /iscsi/${OCF_RESKEY_target_iqn}/tpg1/luns delete ${OCF_RESKEY_lun}
 		if [ -n "${OCF_RESKEY_allowed_initiators}" ]; then
 			for initiator in ${OCF_RESKEY_allowed_initiators}; do
 				if targetcli /iscsi/${OCF_RESKEY_target_iqn}/tpg1/acls/${initiator} status | grep "Mapped LUNs: 0" >/dev/null ; then
 					ocf_run -warn targetcli /iscsi/${OCF_RESKEY_target_iqn}/tpg1/acls/ delete ${initiator}
 				fi
 			done
 		fi
 
 		# If we've proceeded down to here and we're unable to
 		# delete the backstore, then something is seriously
 		# wrong and we need to fail the stop operation
 		# (potentially causing fencing)
 		ocf_run targetcli /backstores/block delete ${OCF_RESOURCE_INSTANCE} || exit $OCF_ERR_GENERIC
 		;;
 	esac
 
 	return $OCF_SUCCESS
 }
 
 iSCSILogicalUnit_monitor() {
 	if [ x"${OCF_RESKEY_tgt_bstype}" != x"rbd" ]; then
 		# If our backing device (or file) doesn't even exist, we're not running
 		[ -e ${OCF_RESKEY_path} ] || return $OCF_NOT_RUNNING
 	fi
 
 	case $OCF_RESKEY_implementation in
 	iet)
 		# Figure out and set the target ID
 		TID=`sed -ne "s/tid:\([[:digit:]]\+\) name:${OCF_RESKEY_target_iqn}$/\1/p" < /proc/net/iet/volume`
 		if [ -z "${TID}" ]; then
 			# Our target is not configured, thus we're not
 			# running.
 			return $OCF_NOT_RUNNING
 		fi
 		# FIXME: this looks for a matching LUN and path, but does
 		# not actually test for the correct target ID.
 		grep -E -q "[[:space:]]+lun:${OCF_RESKEY_lun}.*path:${OCF_RESKEY_path}$" /proc/net/iet/volume && return $OCF_SUCCESS
 		;;
 	tgt)
 		# Figure out and set the target ID
 		TID=`tgtadm --lld iscsi --op show --mode target \
 			| sed -ne "s/^Target \([[:digit:]]\+\): ${OCF_RESKEY_target_iqn}$/\1/p"`
 		if [ -z "$TID" ]; then
 			# Our target is not configured, thus we're not
 			# running.
 			return $OCF_NOT_RUNNING
 		fi
 		# This only looks for the backing store, but does not test
 		# for the correct target ID and LUN.
 		tgtadm --lld iscsi --op show --mode target \
 			| grep -E -q "[[:space:]]+Backing store.*: ${OCF_RESKEY_path}$" && return $OCF_SUCCESS
 		;;
 	lio)
 		configfs_path="/sys/kernel/config/target/iscsi/${OCF_RESKEY_target_iqn}/tpgt_1/lun/lun_${OCF_RESKEY_lun}/${OCF_RESOURCE_INSTANCE}/udev_path"
 		[ -e ${configfs_path} ] && [ `cat ${configfs_path}` = "${OCF_RESKEY_path}" ] && return $OCF_SUCCESS
 
 		# if we aren't activated, is a block device still left over?
 		block_configfs_path="/sys/kernel/config/target/core/iblock_${OCF_RESKEY_lio_iblock}/${OCF_RESOURCE_INSTANCE}/udev_path"
 		[ -e ${block_configfs_path} ] && ocf_log warn "existing block without an active lun: ${block_configfs_path}"
 		[ -e ${block_configfs_path} ] && return $OCF_ERR_GENERIC
 
 		;;
 	lio-t)
 		configfs_path="/sys/kernel/config/target/iscsi/${OCF_RESKEY_target_iqn}/tpgt_1/lun/lun_${OCF_RESKEY_lun}/*/udev_path"
 		[ -e ${configfs_path} ] && [ `cat ${configfs_path}` = "${OCF_RESKEY_path}" ] && return $OCF_SUCCESS
 
 		# if we aren't activated, is a block device still left over?
 		block_configfs_path="/sys/kernel/config/target/core/iblock_*/${OCF_RESOURCE_INSTANCE}/udev_path"
 		[ -e ${block_configfs_path} ] && ocf_log warn "existing block without an active lun: ${block_configfs_path}"
 		[ -e ${block_configfs_path} ] && return $OCF_ERR_GENERIC
 		;;
 	esac
 
 	return $OCF_NOT_RUNNING
 }
 
 iSCSILogicalUnit_validate() {
 	# Do we have all required variables?
 	for var in target_iqn lun path; do
 	param="OCF_RESKEY_${var}"
 	if [ -z "${!param}" ]; then
 		ocf_exit_reason "Missing resource parameter \"$var\"!"
 		exit $OCF_ERR_CONFIGURED
 	fi
 	done
 
 	# Is the configured implementation supported?
 	case "$OCF_RESKEY_implementation" in
 	"iet"|"tgt"|"lio"|"lio-t")
 		;;
 	"")
 		# The user didn't specify an implementation, and we were
 		# unable to determine one from installed binaries (in
 		# other words: no binaries for any supported
 		# implementation could be found)
 		ocf_exit_reason "Undefined iSCSI target implementation"
 		exit $OCF_ERR_INSTALLED
 		;;
 	*)
 		ocf_exit_reason "Unsupported iSCSI target implementation \"$OCF_RESKEY_implementation\"!"
 		exit $OCF_ERR_CONFIGURED
 		;;
 	esac
 
 	# Do we have a valid LUN?
 	case $OCF_RESKEY_implementation in
 	iet)
 		# IET allows LUN 0 and up
 		[ $OCF_RESKEY_lun -ge 0 ]
 		case $? in
 		0)
 			# OK
 			;;
 		1)
 			ocf_log err "Invalid LUN $OCF_RESKEY_lun (must be a non-negative integer)."
 			exit $OCF_ERR_CONFIGURED
 			;;
 		*)
 			ocf_log err "Invalid LUN $OCF_RESKEY_lun (must be an integer)."
 			exit $OCF_ERR_CONFIGURED
 			;;
 		esac
 		;;
 	tgt)
 		# tgt reserves LUN 0 for its own purposes
 		[ $OCF_RESKEY_lun -ge 1 ]
 		case $? in
 		0)
 				# OK
 			;;
 		1)
 			ocf_log err "Invalid LUN $OCF_RESKEY_lun (must be greater than 0)."
 			exit $OCF_ERR_CONFIGURED
 			;;
 		*)
 			ocf_log err "Invalid LUN $OCF_RESKEY_lun (must be an integer)."
 			exit $OCF_ERR_CONFIGURED
 			;;
 		esac
 		;;
 	esac
 
 	# Do we have any configuration parameters that the current
 	# implementation does not support?
 	local unsupported_params
 	local var
 	local envar
 	case $OCF_RESKEY_implementation in
 	iet)
 		# IET does not support setting the vendor and product ID
 		# (it always uses "IET" and "VIRTUAL-DISK")
 		unsupported_params="vendor_id product_id allowed_initiators lio_iblock tgt_bstype tgt_bsoflags tgt_bsopts tgt_device_type"
 		;;
 	tgt)
 		unsupported_params="allowed_initiators lio_iblock"
 		;;
 	lio)
 		unsupported_params="scsi_id vendor_id product_id tgt_bstype tgt_bsoflags tgt_bsopts tgt_device_type"
 		;;
 	lio-t)
 		unsupported_params="scsi_id vendor_id product_id tgt_bstype tgt_bsoflags tgt_bsopts tgt_device_type lio_iblock"
 		;;
 	esac
 
 	for var in ${unsupported_params}; do
 		envar=OCF_RESKEY_${var}
 		defvar=OCF_RESKEY_${var}_default
 		if [ -n "${!envar}" ]; then
 			if  [[ "${!envar}" != "${!defvar}" ]];then 
 				case "$__OCF_ACTION" in
 				start|validate-all)
 					ocf_log warn "Configuration parameter \"${var}\"" \
 						"is not supported by the iSCSI implementation" \
 						"and will be ignored." ;;
 				esac
 			fi
 		fi
 	done
 
 	if ! ocf_is_probe; then
 	# Do we have all required binaries?
 	case $OCF_RESKEY_implementation in
 	iet)
 		check_binary ietadm
 		;;
 	tgt)
 		check_binary tgtadm
 		;;
 	lio)
 		check_binary tcm_node
 		check_binary lio_node
 		;;
 	lio-t)
 		check_binary targetcli
 		;;
 	esac
 
 	# Is the required kernel functionality available?
 	case $OCF_RESKEY_implementation in
 	iet)
 		[ -d /proc/net/iet ]
 		if [ $? -ne 0 ]; then
 			ocf_log err "/proc/net/iet does not exist or is not a directory -- check if required modules are loaded."
 			exit $OCF_ERR_INSTALLED
 		fi
 		;;
 	tgt)
 		# tgt is userland only
 		;;
 	esac
 	fi
 
 	return $OCF_SUCCESS
 }
 
 case $1 in
 meta-data)
 	meta_data
 	exit $OCF_SUCCESS
 	;;
 usage|help)
 	iSCSILogicalUnit_usage
 	exit $OCF_SUCCESS
 	;;
 esac
 
 # Everything except usage and meta-data must pass the validate test
 iSCSILogicalUnit_validate
 
 case $__OCF_ACTION in
 start)		iSCSILogicalUnit_start;;
 stop)		iSCSILogicalUnit_stop;;
 monitor|status)	iSCSILogicalUnit_monitor;;
 reload)		ocf_log err "Reloading..."
 			iSCSILogicalUnit_start
 		;;
 validate-all)	;;
 *)		iSCSILogicalUnit_usage
 		exit $OCF_ERR_UNIMPLEMENTED
 		;;
 esac
 
 rc=$?
 ocf_log debug "${OCF_RESOURCE_INSTANCE} $__OCF_ACTION : $rc"
 exit $rc
diff --git a/heartbeat/iSCSITarget b/heartbeat/iSCSITarget
index 08a765625..2f842205a 100755
--- a/heartbeat/iSCSITarget
+++ b/heartbeat/iSCSITarget
@@ -1,683 +1,690 @@
 #!/bin/bash
 #
 #
 #     iSCSITarget OCF RA. Exports and manages iSCSI targets.
 #
 #   (c) 2009-2010 Florian Haas, Dejan Muhamedagic,
 #                 and Linux-HA contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
 # published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it would be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
 # Further, this software is distributed without any warranty that it is
 # free of the rightful claim of any third person regarding infringement
 # or the like.  Any license provided herein, whether implied or
 # otherwise, applies only to this software file.  Patent licenses, if
 # any, provided herein do not apply to combinations of this program with
 # other software, or any other product whatsoever.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write the Free Software Foundation,
 # Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
 #
 
 #######################################################################
 # Initialization:
 : ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
 . ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
 
 # Defaults
 # Set a default implementation based on software installed
 if have_binary ietadm; then
 	OCF_RESKEY_implementation_default="iet"
 elif have_binary tgtadm; then
 	OCF_RESKEY_implementation_default="tgt"
 elif have_binary lio_node; then
 	OCF_RESKEY_implementation_default="lio"
 elif have_binary targetcli; then
 	OCF_RESKEY_implementation_default="lio-t"
 fi
 : ${OCF_RESKEY_implementation=${OCF_RESKEY_implementation_default}}
 
 # Listen on 0.0.0.0:3260 by default
 OCF_RESKEY_portals_default="0.0.0.0:3260"
 : ${OCF_RESKEY_portals=${OCF_RESKEY_portals_default}}
 
 # Lockfile, used for selecting a target ID
 LOCKFILE=${HA_RSCTMP}/iSCSITarget-${OCF_RESKEY_implementation}.lock
+
+# targetcli: iSCSITarget and iSCSILogicalUnit must use the same lockfile
+TARGETLOCKFILE=${HA_RSCTMP}/targetcli.lock
 #######################################################################
 
 meta_data() {
 	cat <<END
 <?xml version="1.0"?>
 <!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
 <resource-agent name="iSCSITarget">
 <version>0.9</version>
 
 <longdesc lang="en">
 Manages iSCSI targets. An iSCSI target is a collection of SCSI Logical
 Units (LUs) exported via a daemon that speaks the iSCSI protocol.
 </longdesc>
 <shortdesc lang="en">iSCSI target export agent</shortdesc>
 
 <parameters>
 <parameter name="implementation" required="0" unique="0">
 <longdesc lang="en">
 The iSCSI target daemon implementation. Must be one of "iet", "tgt",
 "lio", or "lio-t".  If unspecified, an implementation is selected based on the
 availability of management utilities, with "iet" being tried first,
 then "tgt", then "lio", then "lio-t".
 </longdesc>
 <shortdesc lang="en">Specifies the iSCSI target implementation
 ("iet", "tgt", "lio", or "lio-t").</shortdesc>
 <content type="string" default="${OCF_RESKEY_implementation_default}"/>
 </parameter>
 
 <parameter name="iqn" required="1" unique="1">
 <longdesc lang="en">
 The target iSCSI Qualified Name (IQN). Should follow the conventional
 "iqn.yyyy-mm.&lt;reversed domain name&gt;[:identifier]" syntax.
 </longdesc>
 <shortdesc lang="en">iSCSI target IQN</shortdesc>
 <content type="string" />
 </parameter>
 
 <parameter name="tid" required="0" unique="1">
 <longdesc lang="en">
 The iSCSI target ID. Required for tgt.
 </longdesc>
 <shortdesc lang="en">iSCSI target ID</shortdesc>
 <content type="integer" />
 </parameter>
 
 <parameter name="portals" required="0" unique="0">
 <longdesc lang="en">
 iSCSI network portal addresses. Not supported by all
 implementations. If unset, the default is to create one portal that
 listens on ${OCF_RESKEY_portal_default}.
 </longdesc>
 <shortdesc lang="en">iSCSI portal addresses</shortdesc>
 <content type="string" default="${OCF_RESKEY_portals_default}"/>
 </parameter>
 
 <parameter name="iser_portals" required="0" unique="0">
 <longdesc lang="en">
 iSCSI iSER network portal addresses. Not supported by all
 implementations.
 </longdesc>
 <shortdesc lang="en">iSCSI iSER enabled portal addresses</shortdesc>
 <content type="string"/>
 </parameter>
 
 <parameter name="allowed_initiators" required="0" unique="0">
 <longdesc lang="en">
 Allowed initiators. A space-separated list of initiators allowed to
 connect to this target. Initiators may be listed in any syntax
 the target implementation allows. If this parameter is empty or
 not set, access to this target will be allowed from any initiator.
 </longdesc>
 <shortdesc lang="en">List of iSCSI initiators allowed to connect
 to this target</shortdesc>
 <content type="string" default=""/>
 </parameter>
 
 <parameter name="incoming_username" required="0" unique="1">
 <longdesc lang="en">
 A username used for incoming initiator authentication. If unspecified,
 allowed initiators will be able to log in without authentication.
 This is a unique parameter, as it not allowed to re-use a single
 username across multiple target instances.
 </longdesc>
 <shortdesc lang="en">Incoming account username</shortdesc>
 <content type="string"/>
 </parameter>
 
 <parameter name="incoming_password" required="0" unique="0">
 <longdesc lang="en">
 A password used for incoming initiator authentication.
 </longdesc>
 <shortdesc lang="en">Incoming account password</shortdesc>
 <content type="string"/>
 </parameter>
 
 <parameter name="additional_parameters" required="0" unique="0">
 <longdesc lang="en">
 Additional target parameters. A space-separated list of "name=value"
 pairs which will be passed through to the iSCSI daemon's management
 interface. The supported parameters are implementation
 dependent. Neither the name nor the value may contain whitespace.
 </longdesc>
 <shortdesc lang="en">List of iSCSI target parameters</shortdesc>
 <content type="string" />
 </parameter>
 
 </parameters>
 
 <actions>
 <action name="start"		timeout="10" />
 <action name="stop"		 timeout="10" />
 <action name="status"	   timeout="10" interval="10" depth="0" />
 <action name="monitor"	  timeout="10" interval="10" depth="0" />
 <action name="meta-data"	timeout="5" />
 <action name="validate-all"   timeout="10" />
 </actions>
 </resource-agent>
 END
 }
 
 #######################################################################
 
 iSCSITarget_usage() {
 	cat <<END
 usage: $0 {start|stop|status|monitor|validate-all|meta-data}
 
 Expects to have a fully populated OCF RA-compliant environment set.
 END
 }
 
 iSCSITarget_start() {
 	iSCSITarget_monitor
 	if [ $? =  $OCF_SUCCESS ]; then
 		return $OCF_SUCCESS
 	fi
 
 	local param
 	local name
 	local value
 	local initiator
 	local portal
 
 	case $OCF_RESKEY_implementation in
 	iet)
 		local lasttid
 		local tid
 		if [ "${OCF_RESKEY_tid}" ]; then
 			tid="${OCF_RESKEY_tid}"
 		else
 			# Figure out the last used target ID, add 1 to get the new
 			# target ID.
 			ocf_take_lock $LOCKFILE
 			ocf_release_lock_on_exit $LOCKFILE
 			lasttid=`sed -ne "s/tid:\([[:digit:]]\+\) name:.*/\1/p" < /proc/net/iet/volume | sort -n | tail -n1`
 			[ -z "${lasttid}" ] && lasttid=0
 			tid=$((++lasttid))
 		fi
 
 		# Create the target.
 		ocf_run ietadm --op new \
 			--tid=${tid} \
 			--params Name=${OCF_RESKEY_iqn} || exit $OCF_ERR_GENERIC
 
 		# Set additional parameters.
 		for param in ${OCF_RESKEY_additional_parameters}; do
 			name=${param%=*}
 			value=${param#*=}
 			ocf_run ietadm --op update \
 				--tid=${tid} \
 				--params ${name}=${value} || exit $OCF_ERR_GENERIC
 		done
 
 		# Legacy versions of IET allow targets by default, current
 		# versions deny. To be safe we manage both the .allow and
 		# .deny files.
 		if [ -n "${OCF_RESKEY_allowed_initiators}" ]; then
 			echo "${OCF_RESKEY_iqn} ALL" >> /etc/initiators.deny
 			echo "${OCF_RESKEY_iqn} ${OCF_RESKEY_allowed_initiators// /,}" >> /etc/initiators.allow
 		else
 			echo "${OCF_RESKEY_iqn} ALL" >> /etc/initiators.allow
 		fi
 		# In iet, adding a new user and assigning it to a target
 		# is one operation.
 		if [ -n "${OCF_RESKEY_incoming_username}" ]; then
 			ocf_run ietadm --op new --user \
 				--tid=${tid} \
 				--params=IncomingUser=${OCF_RESKEY_incoming_username},Password=${OCF_RESKEY_incoming_password} \
 				|| exit $OCF_ERR_GENERIC
 		fi
 		;;
 	tgt)
 		local tid
 		tid="${OCF_RESKEY_tid}"
 		# Create the target.
 		ocf_run tgtadm --lld iscsi --op new --mode target \
 			--tid=${tid} \
 			--targetname ${OCF_RESKEY_iqn} || exit $OCF_ERR_GENERIC
 
 		# Set parameters.
 		for param in ${OCF_RESKEY_additional_parameters}; do
 			name=${param%=*}
 			value=${param#*=}
 			ocf_run tgtadm --lld iscsi --op update --mode target \
 				--tid=${tid} \
 				--name=${name} --value=${value} || exit $OCF_ERR_GENERIC
 		done
 
 		# For tgt, we always have to add access per initiator;
 		# access to targets is denied by default. If
 		# "allowed_initiators" is unset, we must use the special
 		# keyword ALL.
 		for initiator in ${OCF_RESKEY_allowed_initiators=ALL}; do
 			ocf_run tgtadm --lld iscsi --op bind --mode target \
 				--tid=${tid} \
 				--initiator-address=${initiator} || exit $OCF_ERR_GENERIC
 		done
 
 		# In tgt, we must first create a user account, then assign
 		# it to a target using the "bind" operation.
 		if [ -n "${OCF_RESKEY_incoming_username}" ]; then
 			ocf_run tgtadm --lld iscsi --mode account --op new \
 				--user=${OCF_RESKEY_incoming_username} \
 				--password=${OCF_RESKEY_incoming_password} || exit $OCF_ERR_GENERIC
 			ocf_run tgtadm --lld iscsi --mode account --op bind \
 				--tid=${tid} \
 				--user=${OCF_RESKEY_incoming_username} || exit $OCF_ERR_GENERIC
 		fi
 		;;
 	lio)
 		# lio distinguishes between targets and target portal
 		# groups (TPGs). We will always create one TPG, with the
 		# number 1. In lio, creating a network portal
 		# automatically creates the corresponding target if it
 		# doesn't already exist.
 		for portal in ${OCF_RESKEY_portals}; do
 			ocf_run lio_node --addnp ${OCF_RESKEY_iqn} 1 \
 				${portal} || exit $OCF_ERR_GENERIC
 		done
 
 		# in lio, we can set target parameters by manipulating
 		# the appropriate configfs entries
 		for param in ${OCF_RESKEY_additional_parameters}; do
 			name=${param%=*}
 			value=${param#*=}
 			configfs_path="/sys/kernel/config/target/iscsi/${OCF_RESKEY_iqn}/tpgt_1/param/${name}"
 			if [ -e ${configfs_path} ]; then
 				echo ${value} > ${configfs_path} || exit $OCF_ERR_GENERIC
 			else
 				ocf_log warn "Unsupported iSCSI target parameter ${name}: will be ignored."
 			fi
 		done
 
 		# lio does per-initiator filtering by default. To disable
 		# this, we need to switch the target to "permissive mode".
 		if [ -n "${OCF_RESKEY_allowed_initiators}" ]; then
 			for initiator in ${OCF_RESKEY_allowed_initiators}; do
 				ocf_run lio_node --addnodeacl ${OCF_RESKEY_iqn} 1 \
 				${initiator} || exit $OCF_ERR_GENERIC
 			done
 		else
 			ocf_run lio_node --permissive ${OCF_RESKEY_iqn} 1 || exit $OCF_ERR_GENERIC
 			# permissive mode enables read-only access by default,
 			# so we need to change that to RW to be in line with
 			# the other implementations.
 			echo 0 > "/sys/kernel/config/target/iscsi/${OCF_RESKEY_iqn}/tpgt_1/attrib/demo_mode_write_protect"
 			if [ `cat /sys/kernel/config/target/iscsi/${OCF_RESKEY_iqn}/tpgt_1/attrib/demo_mode_write_protect` -ne 0 ]; then
 				ocf_log err "Failed to disable write protection for target ${OCF_RESKEY_iqn}."
 				exit $OCF_ERR_GENERIC
 			fi
 		fi
 
 		# TODO: add CHAP authentication support when it gets added
 		# back into LIO
 		ocf_run lio_node --disableauth ${OCF_RESKEY_iqn} 1 || exit $OCF_ERR_GENERIC
 		# Finally, we need to enable the target to allow
 		# initiators to connect
 		ocf_run lio_node --enabletpg=${OCF_RESKEY_iqn} 1 || exit $OCF_ERR_GENERIC
 		;;
 	lio-t)
 		# lio distinguishes between targets and target portal
 		# groups (TPGs). We will always create one TPG, with the
 		# number 1. In lio, creating a network portal
 		# automatically creates the corresponding target if it
 		# doesn't already exist.
+		ocf_take_lock $TARGETLOCKFILE
+		ocf_release_lock_on_exit $TARGETLOCKFILE
 		ocf_run targetcli /iscsi set global auto_add_default_portal=false || exit $OCF_ERR_GENERIC
 		ocf_run targetcli /iscsi create ${OCF_RESKEY_iqn} || exit $OCF_ERR_GENERIC
 		for portal in ${OCF_RESKEY_portals}; do
 			if [ $portal != ${OCF_RESKEY_portals_default} ] ; then
 				IFS=':' read -a sep_portal <<< "$portal"
 				ocf_run targetcli /iscsi/${OCF_RESKEY_iqn}/tpg1/portals create "${sep_portal[0]}" "${sep_portal[1]}" || exit $OCF_ERR_GENERIC
 			else
 				ocf_run targetcli /iscsi create ${OCF_RESKEY_iqn} || exit $OCF_ERR_GENERIC
 			fi
 		done
 		# in lio, we can set target parameters by manipulating
 		# the appropriate configfs entries
 		for param in ${OCF_RESKEY_additional_parameters}; do
 			name=${param%=*}
 			value=${param#*=}
 			configfs_path="/sys/kernel/config/target/iscsi/${OCF_RESKEY_iqn}/tpgt_1/param/${name}"
 			if [ -e ${configfs_path} ]; then
 				echo ${value} > ${configfs_path} || exit $OCF_ERR_GENERIC
 			else
 				ocf_log warn "Unsupported iSCSI target parameter ${name}: will be ignored."
 			fi
 		done
 		
 		# allow iSER enabled portal
 		for iser_portal in ${OCF_RESKEY_iser_portals}; do
                        configfs_path="/sys/kernel/config/target/iscsi/${OCF_RESKEY_iqn}/tpgt_1/np/${iser_portal}\:*/iser"
                        if [ -f ${configfs_path} ]; then
                                  echo "1" > ${configfs_path} || exit $OCF_ERR_GENERIC
                        else
                                  ocf_log warn "Unable to set iSER on: $iser_portal"
                        fi
                 done
 		
 		# lio does per-initiator filtering by default. To disable
 		# this, we need to switch the target to "permissive mode".
 		if [ -n "${OCF_RESKEY_allowed_initiators}" ]; then
 			for initiator in ${OCF_RESKEY_allowed_initiators}; do
 				ocf_run targetcli /iscsi/${OCF_RESKEY_iqn}/tpg1/acls create ${initiator} || exit $OCF_ERR_GENERIC
 			done
 		else
 			ocf_run targetcli /iscsi/${OCF_RESKEY_iqn}/tpg1/ set attribute authentication=0 demo_mode_write_protect=0 generate_node_acls=1 cache_dynamic_acls=1 || exit $OCF_ERR_GENERIC
 		fi
 		# TODO: add CHAP authentication support when it gets added
 		# back into LIO
 		ocf_run targetcli /iscsi/${OCF_RESKEY_iqn}/tpg1/ set attribute authentication=0 || exit $OCF_ERR_GENERIC
 #			   ocf_run targetcli /iscsi 
 		;;
 	esac
 
 	iSCSITarget_monitor
 }
 
 iSCSITarget_stop() {
 	iSCSITarget_monitor
 	if [ $? -eq $OCF_NOT_RUNNING ]; then
 		return $OCF_SUCCESS
 	fi
 
 	local tid
 	case $OCF_RESKEY_implementation in
 	iet)
 		# Figure out the target ID
 		tid=`sed -ne "s/tid:\([[:digit:]]\+\) name:${OCF_RESKEY_iqn}/\1/p" < /proc/net/iet/volume`
 		if [ -z "${tid}" ]; then
 			ocf_log err "Failed to retrieve target ID for IQN ${OCF_RESKEY_iqn}"
 			exit $OCF_ERR_GENERIC
 		fi
 		# Close existing connections. There is no other way to
 		# do this in IET than to parse the contents of
 		# /proc/net/iet/session.
 		set -- $(sed -ne '/^tid:'${tid}' /,/^tid/ {
 						  /^[[:space:]]*sid:\([0-9]\+\)/ {
 							 s/^[[:space:]]*sid:\([0-9]*\).*/--sid=\1/; h;
 						  };
 						  /^[[:space:]]*cid:\([0-9]\+\)/ { 
 							  s/^[[:space:]]*cid:\([0-9]*\).*/--cid=\1/; G; p; 
 						  }; 
 					  }' < /proc/net/iet/session)
 		while [[ -n $2 ]]; do
 			# $2 $1 looks like "--sid=X --cid=Y"
 			ocf_run ietadm --op delete \
 				 --tid=${tid} $2 $1
 			shift 2
 		done
 			# In iet, unassigning a user from a target and
 		# deleting the user account is one operation.
 		if [ -n "${OCF_RESKEY_incoming_username}" ]; then
 			ocf_run ietadm --op delete --user \
 			--tid=${tid} \
 			--params=IncomingUser=${OCF_RESKEY_incoming_username} \
 			|| exit $OCF_ERR_GENERIC
 		fi
 		# Loop on delete. Keep trying until we time out, if
 		# necessary.
 		while true; do
 			if ietadm --op delete --tid=${tid}; then
 				ocf_log debug "Removed target ${OCF_RESKEY_iqn}."
 				break
 			else
 				ocf_log warn "Failed to remove target ${OCF_RESKEY_iqn}, retrying."
 				sleep 1
 			fi
 		done
 		# Avoid stale /etc/initiators.{allow,deny} entries
 		# for this target
 		if [ -e /etc/initiators.deny ]; then
 			ocf_run sed -e "/^${OCF_RESKEY_iqn}[[:space:]]/d" \
 			-i /etc/initiators.deny
 		fi
 		if [ -e /etc/initiators.allow ]; then
 			ocf_run sed -e "/^${OCF_RESKEY_iqn}[[:space:]]/d" \
 			-i /etc/initiators.allow
 		fi
 		;;
 	tgt)
 		tid="${OCF_RESKEY_tid}"
 		# Close existing connections. There is no other way to
 		# do this in tgt than to parse the output of "tgtadm --op
 		# show".
 		set -- $(tgtadm --lld iscsi --op show --mode target \
 			| sed -ne '/^Target '${tid}':/,/^Target/ {
 						  /^[[:space:]]*I_T nexus: \([0-9]\+\)/ {
 							 s/^.*: \([0-9]*\).*/--sid=\1/; h;
 						  };
 						  /^[[:space:]]*Connection: \([0-9]\+\)/ { 
 							  s/^.*: \([0-9]*\).*/--cid=\1/; G; p; 
 						  }; 
 						  /^[[:space:]]*LUN information:/ q; 
 					  }')
 		while [[ -n $2 ]]; do
 			# $2 $1 looks like "--sid=X --cid=Y"
 			ocf_run tgtadm --lld iscsi --op delete --mode connection \
 			--tid=${tid} $2 $1
 			shift 2
 		done
 			# In tgt, we must first unbind the user account from
 		# the target, then remove the account itself.
 		if [ -n "${OCF_RESKEY_incoming_username}" ]; then
 			ocf_run tgtadm --lld iscsi --mode account --op unbind \
 				--tid=${tid} \
 				--user=${OCF_RESKEY_incoming_username} || exit $OCF_ERR_GENERIC
 			ocf_run tgtadm --lld iscsi --mode account --op delete \
 				--user=${OCF_RESKEY_incoming_username} || exit $OCF_ERR_GENERIC
 		fi
 		# Loop on delete. Keep trying until we time out, if
 		# necessary.
 		while true; do
 			if tgtadm --lld iscsi --op delete --mode target --tid=${tid}; then
 				ocf_log debug "Removed target ${OCF_RESKEY_iqn}."
 				break
 			else
 				ocf_log warn "Failed to remove target ${OCF_RESKEY_iqn}, retrying."
 				sleep 1
 			fi
 		done
 		# In tgt, we don't have to worry about our ACL
 		# entries. They are automatically removed upon target
 		# deletion.
 		;;
 	lio)
 		# In lio, removing a target automatically removes all
 		# associated TPGs, network portals, and LUNs.
 		ocf_run lio_node --deliqn ${OCF_RESKEY_iqn} || exit $OCF_ERR_GENERIC
 		;;
 	lio-t)
+		ocf_take_lock $TARGETLOCKFILE
+		ocf_release_lock_on_exit $TARGETLOCKFILE
 		ocf_run targetcli /iscsi delete ${OCF_RESKEY_iqn} || exit $OCF_ERR_GENERIC
 		;;
 	esac
 
 	return $OCF_SUCCESS
 }
 
 iSCSITarget_monitor() {
 	case $OCF_RESKEY_implementation in
 	iet)
 		grep -Eq "tid:[0-9]+ name:${OCF_RESKEY_iqn}" /proc/net/iet/volume && return $OCF_SUCCESS
 		;;
 	tgt)
 		tgtadm --lld iscsi --op show --mode target \
 		| grep -Eq "Target [0-9]+: ${OCF_RESKEY_iqn}" && return $OCF_SUCCESS
 		;;
 	lio | lio-t)
 		# if we have no configfs entry for the target, it's
 		# definitely stopped
 		[ -d /sys/kernel/config/target/iscsi/${OCF_RESKEY_iqn} ] || return $OCF_NOT_RUNNING
 		# if the target is there, but its TPG is not enabled, then
 		# we also consider it stopped
 		[ `cat /sys/kernel/config/target/iscsi/${OCF_RESKEY_iqn}/tpgt_1/enable` -eq 1 ] || return $OCF_NOT_RUNNING
 		return $OCF_SUCCESS
 		;;
 	esac
 	
 	return $OCF_NOT_RUNNING
 }
 
 iSCSITarget_validate() {
 	# Do we have all required variables?
 	local required_vars
 	case $OCF_RESKEY_implementation in
 	iet)
 		required_vars="iqn"
 		;;
 	tgt)
 		required_vars="iqn tid"
 		;;
 	esac
 
 	for var in ${required_vars}; do
 		param="OCF_RESKEY_${var}"
 		if [ -z "${!param}" ]; then
 			ocf_exit_reason "Missing resource parameter \"$var\"!"
 			exit $OCF_ERR_CONFIGURED
 		fi
 	done
 
 	# Is the configured implementation supported?
 	case "$OCF_RESKEY_implementation" in
 	"iet"|"tgt"|"lio"|"lio-t")
 		;;
 	"")
 		# The user didn't specify an implementation, and we were
 		# unable to determine one from installed binaries (in
 		# other words: no binaries for any supported
 		# implementation could be found)
 		ocf_exit_reason "Undefined iSCSI target implementation"
 		exit $OCF_ERR_INSTALLED
 		;;
 	*)
 		ocf_exit_reason "Unsupported iSCSI target implementation \"$OCF_RESKEY_implementation\"!"
 		exit $OCF_ERR_CONFIGURED
 		;;
 	esac
 
 	# Do we have any configuration parameters that the current
 	# implementation does not support?
 	local unsupported_params
 	local var
 	local envar
 	case $OCF_RESKEY_implementation in
 	iet|tgt)
 		# IET and tgt do not support binding a target portal to a
 		# specific IP address.
 		unsupported_params="portals"
 		;;
 	lio|lio-t)
 		# TODO: Remove incoming_username and incoming_password
 		# from this check when LIO 3.0 gets CHAP authentication
 		unsupported_params="tid incoming_username incoming_password"
 		;;
 	esac
 
 	for var in ${unsupported_params}; do
 		envar=OCF_RESKEY_${var}
 		defvar=OCF_RESKEY_${var}_default
 		if [ -n "${!envar}" ]; then
 			if  [[ "${!envar}" != "${!defvar}" ]];then
 				case "$__OCF_ACTION" in
 					start|validate-all)
 						ocf_log warn "Configuration parameter \"${var}\"" \
 							"is not supported by the iSCSI implementation" \
 							"and will be ignored." ;;
 				esac
 			fi
 		fi
 	done
 
 	if ! ocf_is_probe; then
 		# Do we have all required binaries?
 	case $OCF_RESKEY_implementation in
 	iet)
 		check_binary ietadm
 		;;
 	tgt)
 		check_binary tgtadm
 		;;
 	lio)
 		check_binary tcm_node
 		check_binary lio_node
 		;;
 	lio-t)
 		check_binary targetcli
 		;;
 	esac
 
 	# Is the required kernel functionality available?
 	case $OCF_RESKEY_implementation in
 	iet)
 		[ -d /proc/net/iet ]
 		if [ $? -ne 0 ]; then
 			ocf_log err "/proc/net/iet does not exist or is not a directory -- check if required modules are loaded."
 			exit $OCF_ERR_INSTALLED
 		fi
 		;;
 	tgt)
 			# tgt is userland only
 		;;
 	lio)
 			# lio needs configfs to be mounted
 		if ! grep -Eq "^.*/sys/kernel/config[[:space:]]+configfs" /proc/mounts; then
 			ocf_log err "configfs not mounted at /sys/kernel/config -- check if required modules are loaded."
 			exit $OCF_ERR_INSTALLED
 		fi
 			# check for configfs entries created by target_core_mod
 		if [ ! -d /sys/kernel/config/target ]; then
 			ocf_log err "/sys/kernel/config/target does not exist or is not a directory -- check if required modules are loaded."
 			exit $OCF_ERR_INSTALLED
 		fi
 		;;
 	lio-t)
 		#targetcli loads the needed kernel modules
 		;;
 	esac
 	fi
 
 	return $OCF_SUCCESS
 }
 
 
 case $1 in
   meta-data)
 	meta_data
 	exit $OCF_SUCCESS
 	;;
   usage|help)
 	iSCSITarget_usage
 	exit $OCF_SUCCESS
 	;;
 esac
 
 # Everything except usage and meta-data must pass the validate test
 iSCSITarget_validate
 
 case $__OCF_ACTION in
 start)		iSCSITarget_start;;
 stop)		iSCSITarget_stop;;
 monitor|status)	iSCSITarget_monitor;;
 reload)		ocf_log err "Reloading..."
 			iSCSITarget_start
 		;;
 validate-all)	;;
 *)		iSCSITarget_usage
 		exit $OCF_ERR_UNIMPLEMENTED
 		;;
 esac
 rc=$?
 ocf_log debug "${OCF_RESOURCE_INSTANCE} $__OCF_ACTION : $rc"
 exit $rc