* [Cluster-devel] [PATCH] fs-lib: fix do_monitor device mapping
@ 2011-03-15 8:57 Fabio M. Di Nitto
2011-03-15 13:22 ` Lon Hohberger
0 siblings, 1 reply; 2+ messages in thread
From: Fabio M. Di Nitto @ 2011-03-15 8:57 UTC (permalink / raw)
To: cluster-devel.redhat.com
do_monitor needs to expand _device key to the real device
before performing checks
Resolves: rhbz#669832
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
rgmanager/src/resources/utils/fs-lib.sh | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/rgmanager/src/resources/utils/fs-lib.sh b/rgmanager/src/resources/utils/fs-lib.sh
index 4f242f7..7b933f8 100644
--- a/rgmanager/src/resources/utils/fs-lib.sh
+++ b/rgmanager/src/resources/utils/fs-lib.sh
@@ -866,7 +866,18 @@ do_stop() {
do_monitor() {
- is_mounted "${OCF_RESKEY_device}" "${OCF_RESKEY_mountpoint}"
+ #
+ # Get the device
+ #
+ real_device "$OCF_RESKEY_device"
+ dev="$REAL_DEVICE"
+ if [ -z "$dev" ]; then
+ ocf_log err "\
+start_filesystem: Could not match $OCF_RESKEY_device with a real device"
+ return $OCF_ERR_ARGS
+ fi
+
+ is_mounted "$dev" "${OCF_RESKEY_mountpoint}"
if [ $? -ne $YES ]; then
ocf_log err "${OCF_RESOURCE_INSTANCE}: ${OCF_RESKEY_device} is not mounted on ${OCF_RESKEY_mountpoint}"
--
1.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Cluster-devel] [PATCH] fs-lib: fix do_monitor device mapping
2011-03-15 8:57 [Cluster-devel] [PATCH] fs-lib: fix do_monitor device mapping Fabio M. Di Nitto
@ 2011-03-15 13:22 ` Lon Hohberger
0 siblings, 0 replies; 2+ messages in thread
From: Lon Hohberger @ 2011-03-15 13:22 UTC (permalink / raw)
To: cluster-devel.redhat.com
On Tue, Mar 15, 2011 at 09:57:50AM +0100, Fabio M. Di Nitto wrote:
> do_monitor needs to expand _device key to the real device
> before performing checks
Looks right.
--
Lon Hohberger - Red Hat, Inc.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-03-15 13:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-15 8:57 [Cluster-devel] [PATCH] fs-lib: fix do_monitor device mapping Fabio M. Di Nitto
2011-03-15 13:22 ` Lon Hohberger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).