DEVEL15-flock-handle-uae-errors-20060601

handle uae versions of errors for flock locks

(cherry picked from commit 99b572a00a342ab6ff003eb6736eb24a27e8fb15)

diff --git a/src/afs/VNOPS/afs_vnop_flock.c b/src/afs/VNOPS/afs_vnop_flock.c
index 6222e45a2bee6bd63877c36e7660f3958d05f4f0..e2eaf8ac67581b261c0bce73b1711e3606ad7598 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_flock.c
+++ b/src/afs/VNOPS/afs_vnop_flock.c
@@ -24,6 +24,7 @@ RCSID
 #include "afs/afs_cbqueue.h"
 #include "afs/nfsclient.h"
 #include "afs/afs_osidnlc.h"
+#include "afs/unified_afs.h"
 
 /* Static prototypes */
 static int HandleGetLock(register struct vcache *avc,
@@ -422,7 +423,8 @@ HandleFlock(register struct vcache *avc, int acom, struct vrequest *areq,
                break;
            }
            /* now, if we got EWOULDBLOCK, and we're supposed to wait, we do */
-           if (((code == EWOULDBLOCK) || (code == EAGAIN))
+           if (((code == EWOULDBLOCK) || (code == EAGAIN) || 
+                (code == UAEWOULDBLOCK) || (code == UAEAGAIN))
                && !(acom & LOCK_NB)) {
                /* sleep for a second, allowing interrupts */
                ReleaseWriteLock(&avc->lock);