[pve-devel] r6390 - in pve-storage/pve2: . PVE

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-08-01 13:36:41 +0200 (Mon, 01 Aug 2011)
New Revision: 6390

Modified:
   pve-storage/pve2/ChangeLog
   pve-storage/pve2/PVE/Storage.pm
Log:
	(cluster_lock_storage): fix cfs_lock_file() arguments,
	(lock_storage_config): use default timeout (10)



Modified: pve-storage/pve2/ChangeLog
===================================================================
--- pve-storage/pve2/ChangeLog	2011-08-01 11:35:03 UTC (rev 6389)
+++ pve-storage/pve2/ChangeLog	2011-08-01 11:36:41 UTC (rev 6390)
@@ -5,6 +5,8 @@
 	(iscsi_discovery): test if portal is online using
 	iscsi_test_portal(). This avoids that we run int a timeout (iscsi
 	default timeout is 15 seconds, we now use 2 seconds)
+	(cluster_lock_storage): fix cfs_lock_file() arguments,
+	(lock_storage_config): use default timeout (10)
 
 	* PVE/API2/Storage/Config.pm: s/resolv_portal_dns/resolv_portal/
 	(delete) do not call deactivate_storage(), because we likely run

Modified: pve-storage/pve2/PVE/Storage.pm
===================================================================
--- pve-storage/pve2/PVE/Storage.pm	2011-08-01 11:35:03 UTC (rev 6389)
+++ pve-storage/pve2/PVE/Storage.pm	2011-08-01 11:36:41 UTC (rev 6390)
@@ -126,9 +126,7 @@
 sub lock_storage_config {
     my ($code, $errmsg) = @_;
 
-    my $parent = ( caller(1) )[3];
-
-    cfs_lock_file("storage.cfg", 60, $parent, $code);
+    cfs_lock_file("storage.cfg", undef, $code);
     my $err = $@;
     if ($err) {
 	$errmsg ? die "$errmsg: $err" : die $err;
@@ -598,7 +596,7 @@
 	$res = PVE::Tools::lock_file("$lockdir/$lockid", $timeout, $locktext, $func, @param); 
 	die $@ if $@;
     } else {
-	$res = PVE::Cluster::cfs_lock_storage($storeid, $timeout, $locktext, $func, @param);
+	$res = PVE::Cluster::cfs_lock_storage($storeid, $timeout, $func, @param);
 	die $@ if $@;
     }	
     return $res;