Imported Upstream version 3.3.0

[debian/amanda] / perl / Amanda / Util.pod

diff --git a/perl/Amanda/Util.pod b/perl/Amanda/Util.pod
index a78e50a32c23566a79cb8c8e6fef36c379bf0a6c..3ee51aad37e50d9f56121a9d21dd8a524e110ed6 100644 (file)
--- a/perl/Amanda/Util.pod
+++ b/perl/Amanda/Util.pod
@@ -163,7 +163,7 @@ bytes it read from the file descriptor.
 Return a "safe" environment hash.  For non-setuid programs, this means
 filtering out any localization variables.
 
-=item get_fs_usage(file, disk)
+=item get_fs_usage(file)
 
 This is a wrapper around the Gnulib function of the same name.  On success, it returns
 a hash with keys:
@@ -383,11 +383,17 @@ filename to lock:
 
   my $fl = Amanda::Util::file_lock->new($filename)
 
-then, lock the file:
+then, three ways to lock the file:
 
-  $fl->lock();
+  $fl->lock_wr();       # take a write lock (exclusive)
+  $fl->lock_rd();       # take a read lock
+  $fl->lock();         # take a write lock and reads the contents of
+                        # the file into memory.
 
-which also reads the contents of the file into memory, accessible via
+they return -1 on failure, 0 if the lock is taken or 1 if the lock in not
+taken (you can retry later).
+
+to access the data in memory
 
   my $state = $fl->data();