diff options
| author | Max Kellermann <max@duempel.org> | 2014-12-15 00:46:56 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-12-15 00:46:56 +0100 |
| commit | adfc5db3d2bf0d7df972a687b1510db159b9137c (patch) | |
| tree | d0b46d10fa1e655211f92f6a5f5f581876a9a0db /src/lib/nfs/Blocking.cxx | |
| parent | 3f32a6b6071c61543f8a5179fdd6900e1362cbd6 (diff) | |
| parent | a48704925d6c3e5c01057192403e55f3663b315c (diff) | |
| download | mpd-adfc5db3d2bf0d7df972a687b1510db159b9137c.tar.gz mpd-adfc5db3d2bf0d7df972a687b1510db159b9137c.tar.xz mpd-adfc5db3d2bf0d7df972a687b1510db159b9137c.zip | |
Merge branch 'v0.19.x'
Diffstat (limited to 'src/lib/nfs/Blocking.cxx')
| -rw-r--r-- | src/lib/nfs/Blocking.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/nfs/Blocking.cxx b/src/lib/nfs/Blocking.cxx index 5f769c408..58eaf6af2 100644 --- a/src/lib/nfs/Blocking.cxx +++ b/src/lib/nfs/Blocking.cxx @@ -20,7 +20,9 @@ #include "config.h" #include "Blocking.hxx" #include "Connection.hxx" +#include "Domain.hxx" #include "event/Call.hxx" +#include "util/Error.hxx" bool BlockingNfsOperation::Run(Error &_error) @@ -31,7 +33,10 @@ BlockingNfsOperation::Run(Error &_error) [this](){ connection.AddLease(*this); }); /* wait for completion */ - LockWaitFinished(); + if (!LockWaitFinished()) { + _error.Set(nfs_domain, 0, "Timeout"); + return false; + } /* check for error */ if (error.IsDefined()) { |