florian.haas at linbit
Jul 1, 2009, 1:49 AM
Views: 300
Permalink
|
|
[PATCH 4 of 4] RA: iSCSITarget, iSCSILogicalUnit: remove useless "return" after check_binary
|
|
# HG changeset patch
# User Florian Haas <florian.haas[at]linbit.com>
# Date 1246437815 -7200
# Node ID 576ea5329287414a81ab87fdfbdab6638f9acf9b
# Parent 7a6c5795122013cddbde6ca66ddd043671b26b0c
RA: iSCSITarget, iSCSILogicalUnit: remove useless "return" after check_binary
Minor cleanup for the iSCSITarget and iSCSILogicalUnit RAs:
check_binary exits with $OCF_ERR_INSTALLED if the requested binary is
not found. Thus the useless return statements after check_binary in
validate-all can be removed.
diff -r 7a6c57951220 -r 576ea5329287 resources/OCF/iSCSILogicalUnit
--- a/resources/OCF/iSCSILogicalUnit Wed Jul 01 10:43:35 2009 +0200
+++ b/resources/OCF/iSCSILogicalUnit Wed Jul 01 10:43:35 2009 +0200
@@ -299,10 +299,10 @@
# Do we have all required binaries?
case $OCF_RESKEY_implementation in
iet)
- check_binary ietadm || return $OCF_ERR_INSTALLED
+ check_binary ietadm
;;
tgt)
- check_binary tgtadm || return $OCF_ERR_INSTALLED
+ check_binary tgtadm
;;
*)
# and by the way, is the implementation supported?
diff -r 7a6c57951220 -r 576ea5329287 resources/OCF/iSCSITarget
--- a/resources/OCF/iSCSITarget Wed Jul 01 10:43:35 2009 +0200
+++ b/resources/OCF/iSCSITarget Wed Jul 01 10:43:35 2009 +0200
@@ -360,10 +360,10 @@
# Do we have all required binaries?
case $OCF_RESKEY_implementation in
iet)
- check_binary ietadm || return $OCF_ERR_INSTALLED
+ check_binary ietadm
;;
tgt)
- check_binary tgtadm || return $OCF_ERR_INSTALLED
+ check_binary tgtadm
;;
*)
# and by the way, is the implementation supported?
_______________________________________________________
Linux-HA-Dev: Linux-HA-Dev[at]lists.linux-ha.org
http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev
Home Page: http://linux-ha.org/
|
[PATCH 4 of 4] RA: iSCSITarget, iSCSILogicalUnit: remove useless "return" after check_binary