From ab1723f3066efbe0216709c67587e8a2ff05ec81 Mon Sep 17 00:00:00 2001 From: Thomas Schoebel-Theuer Date: Wed, 22 Jan 2014 08:45:02 +0100 Subject: [PATCH] marsadm: fix lamport warning when mars.ko is not loaded --- userspace/marsadm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/userspace/marsadm b/userspace/marsadm index 21344487..eadc8a2f 100755 --- a/userspace/marsadm +++ b/userspace/marsadm @@ -179,12 +179,13 @@ sub get_alive_links { # fallback to system time() # sub mars_time { - open(my $lamport_clock, "<", "/proc/sys/mars/lamport_clock"); my $lamport_time; - while (<$lamport_clock>) { - $lamport_time = $1 if /^lamport_now=(.*)/; + if (open(my $lamport_clock, "<", "/proc/sys/mars/lamport_clock")) { + while (<$lamport_clock>) { + $lamport_time = $1 if /^lamport_now=(.*)/; + } + close($lamport_clock); } - close($lamport_clock); return $lamport_time || time() . "." . '0' x 9; }